ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtiofsd: Add Makefile wiring for virtiofsd contrib 

Wire up the building of the virtiofsd in tools.

virtiofsd relies on Linux-specific system calls and seccomp.  Anyone
wishing to port it to other host operating systems should do so
carefully and without reducing security.

Only allow building on Linux hosts.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2019-02-07 12:17:21 +00:00
parent 2f65e69a7f
commit 81bfc42dcf
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -327,6 +327,10 @@ HELPERS-y += vhost-user-gpu$(EXESUF)
vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json
endif endif
ifdef CONFIG_LINUX
HELPERS-y += virtiofsd$(EXESUF)
endif
# Sphinx does not allow building manuals into the same directory as # Sphinx does not allow building manuals into the same directory as
# the source files, so if we're doing an in-tree QEMU build we must # the source files, so if we're doing an in-tree QEMU build we must
# build the manuals into a subdirectory (and then install them from # build the manuals into a subdirectory (and then install them from
@ -429,6 +433,7 @@ dummy := $(call unnest-vars,, \
elf2dmp-obj-y \ elf2dmp-obj-y \
ivshmem-client-obj-y \ ivshmem-client-obj-y \
ivshmem-server-obj-y \ ivshmem-server-obj-y \
virtiofsd-obj-y \
rdmacm-mux-obj-y \ rdmacm-mux-obj-y \
libvhost-user-obj-y \ libvhost-user-obj-y \
vhost-user-scsi-obj-y \ vhost-user-scsi-obj-y \
@ -668,6 +673,11 @@ rdmacm-mux$(EXESUF): LIBS += "-libumad"
rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)
$(call LINK, $^) $(call LINK, $^)
ifdef CONFIG_LINUX # relies on Linux-specific syscalls
virtiofsd$(EXESUF): $(virtiofsd-obj-y) libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
endif
vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) $(libvhost-user-obj-y) libqemuutil.a libqemustub.a vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) $(libvhost-user-obj-y) libqemuutil.a libqemustub.a
$(call LINK, $^) $(call LINK, $^)

1
Makefile.objs
View File

@ -123,6 +123,7 @@ vhost-user-blk-obj-y = contrib/vhost-user-blk/
rdmacm-mux-obj-y = contrib/rdmacm-mux/ rdmacm-mux-obj-y = contrib/rdmacm-mux/
vhost-user-input-obj-y = contrib/vhost-user-input/ vhost-user-input-obj-y = contrib/vhost-user-input/
vhost-user-gpu-obj-y = contrib/vhost-user-gpu/ vhost-user-gpu-obj-y = contrib/vhost-user-gpu/
virtiofsd-obj-y = tools/virtiofsd/
###################################################################### ######################################################################
trace-events-subdirs = trace-events-subdirs =

9
tools/virtiofsd/Makefile.objs Normal file
View File

@ -0,0 +1,9 @@
virtiofsd-obj-y = buffer.o \
fuse_opt.o \
fuse_log.o \
fuse_lowlevel.o \
fuse_signals.o \
fuse_virtio.o \
helper.o \
passthrough_ll.o