[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 24/30] virtiofsd: Add Makefile wiring for virtiofsd contrib
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PATCH 24/30] virtiofsd: Add Makefile wiring for virtiofsd contrib |
Date: |
Mon, 21 Oct 2019 11:58:26 +0100 |
From: "Dr. David Alan Gilbert" <address@hidden>
Wire up the building of the virtiofsd in contrib.
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 <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
Makefile | 8 ++++++++
Makefile.objs | 1 +
contrib/virtiofsd/Makefile.objs | 10 ++++++++++
3 files changed, 19 insertions(+)
create mode 100644 contrib/virtiofsd/Makefile.objs
diff --git a/Makefile b/Makefile
index d20e7ffce3..694a871384 100644
--- a/Makefile
+++ b/Makefile
@@ -316,6 +316,8 @@ HELPERS-y =
HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) =
qemu-bridge-helper$(EXESUF)
ifdef CONFIG_LINUX
+HELPERS-y += virtiofsd$(EXESUF)
+
ifdef CONFIG_VIRGL
ifdef CONFIG_GBM
HELPERS-y += vhost-user-gpu$(EXESUF)
@@ -423,6 +425,7 @@ dummy := $(call unnest-vars,, \
elf2dmp-obj-y \
ivshmem-client-obj-y \
ivshmem-server-obj-y \
+ virtiofsd-obj-y \
rdmacm-mux-obj-y \
libvhost-user-obj-y \
vhost-user-scsi-obj-y \
@@ -658,6 +661,11 @@ rdmacm-mux$(EXESUF): LIBS += "-libumad"
rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)
$(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
$(call LINK, $^)
diff --git a/Makefile.objs b/Makefile.objs
index abcbd89654..24d0b56f1f 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -125,6 +125,7 @@ vhost-user-blk-obj-y = contrib/vhost-user-blk/
rdmacm-mux-obj-y = contrib/rdmacm-mux/
vhost-user-input-obj-y = contrib/vhost-user-input/
vhost-user-gpu-obj-y = contrib/vhost-user-gpu/
+virtiofsd-obj-y = contrib/virtiofsd/
######################################################################
trace-events-subdirs =
diff --git a/contrib/virtiofsd/Makefile.objs b/contrib/virtiofsd/Makefile.objs
new file mode 100644
index 0000000000..67be16332c
--- /dev/null
+++ b/contrib/virtiofsd/Makefile.objs
@@ -0,0 +1,10 @@
+virtiofsd-obj-y = buffer.o \
+ fuse_opt.o \
+ fuse_log.o \
+ fuse_loop_mt.o \
+ fuse_lowlevel.o \
+ fuse_signals.o \
+ fuse_virtio.o \
+ helper.o \
+ passthrough_ll.o
+
--
2.23.0
- Re: [PATCH 17/30] virtiofsd: Add main virtio loop, (continued)
- [PATCH 19/30] virtiofsd: Start queue threads, Dr. David Alan Gilbert (git), 2019/10/21
- [PATCH 20/30] virtiofsd: Poll kick_fd for queue, Dr. David Alan Gilbert (git), 2019/10/21
- [PATCH 18/30] virtiofsd: get/set features callbacks, Dr. David Alan Gilbert (git), 2019/10/21
- [PATCH 23/30] virtiofsd: Keep track of replies, Dr. David Alan Gilbert (git), 2019/10/21
- [PATCH 22/30] virtiofsd: Send replies to messages, Dr. David Alan Gilbert (git), 2019/10/21
- [PATCH 21/30] virtiofsd: Start reading commands from queue, Dr. David Alan Gilbert (git), 2019/10/21
- [PATCH 27/30] virtiofsd: make -f (foreground) the default, Dr. David Alan Gilbert (git), 2019/10/21
- [PATCH 24/30] virtiofsd: Add Makefile wiring for virtiofsd contrib,
Dr. David Alan Gilbert (git) <=
- [PATCH 26/30] virtiofsd: add --fd=FDNUM fd passing option, Dr. David Alan Gilbert (git), 2019/10/21
- [PATCH 25/30] virtiofsd: Fast path for virtio read, Dr. David Alan Gilbert (git), 2019/10/21
- [PATCH 29/30] virtiofsd: add --print-capabilities option, Dr. David Alan Gilbert (git), 2019/10/21
- [PATCH 30/30] virtiofs: Add maintainers entry, Dr. David Alan Gilbert (git), 2019/10/21
- [PATCH 28/30] virtiofsd: add vhost-user.json file, Dr. David Alan Gilbert (git), 2019/10/21
- Re: [PATCH 00/30] virtiofs daemon (base), no-reply, 2019/10/21