[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 027/111] virtiofsd: Add Makefile wiring for virtiofsd contrib
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 027/111] virtiofsd: Add Makefile wiring for virtiofsd contrib |
Date: |
Thu, 23 Jan 2020 11:57:17 +0000 |
From: "Dr. David Alan Gilbert" <address@hidden>
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 <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Liam Merwick <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
Makefile | 10 ++++++++++
Makefile.objs | 1 +
tools/virtiofsd/Makefile.objs | 9 +++++++++
3 files changed, 20 insertions(+)
create mode 100644 tools/virtiofsd/Makefile.objs
diff --git a/Makefile b/Makefile
index 6562b0dc97..ef1e2155a7 100644
--- a/Makefile
+++ b/Makefile
@@ -327,6 +327,10 @@ HELPERS-y += vhost-user-gpu$(EXESUF)
vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json
endif
+ifdef CONFIG_LINUX
+HELPERS-y += virtiofsd$(EXESUF)
+endif
+
# 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
# build the manuals into a subdirectory (and then install them from
@@ -429,6 +433,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 \
@@ -668,6 +673,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 7c1e50f9d6..ff396b9209 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -123,6 +123,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 = tools/virtiofsd/
######################################################################
trace-events-subdirs =
diff --git a/tools/virtiofsd/Makefile.objs b/tools/virtiofsd/Makefile.objs
new file mode 100644
index 0000000000..45a807500d
--- /dev/null
+++ b/tools/virtiofsd/Makefile.objs
@@ -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
+
--
2.24.1
- [PULL 014/111] vitriofsd/passthrough_ll: fix fallocate() ifdefs, (continued)
- [PULL 014/111] vitriofsd/passthrough_ll: fix fallocate() ifdefs, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 004/111] virtiofsd: Add fuse_lowlevel.c, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 015/111] virtiofsd: Make fsync work even if only inode is passed in, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 020/111] virtiofsd: Add main virtio loop, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 012/111] virtiofsd: Fix common header and define for QEMU builds, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 018/111] virtiofsd: Open vhost connection instead of mounting, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 016/111] virtiofsd: Add options for virtio, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 023/111] virtiofsd: Poll kick_fd for queue, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 025/111] virtiofsd: Send replies to messages, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 024/111] virtiofsd: Start reading commands from queue, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 027/111] virtiofsd: Add Makefile wiring for virtiofsd contrib,
Dr. David Alan Gilbert (git) <=
- [PULL 026/111] virtiofsd: Keep track of replies, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 029/111] virtiofsd: add --fd=FDNUM fd passing option, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 031/111] virtiofsd: add vhost-user.json file, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 021/111] virtiofsd: get/set features callbacks, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 022/111] virtiofsd: Start queue threads, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 017/111] virtiofsd: add -o source=PATH to help output, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 019/111] virtiofsd: Start wiring up vhost-user, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 028/111] virtiofsd: Fast path for virtio read, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 007/111] virtiofsd: Format imported files to qemu style, Dr. David Alan Gilbert (git), 2020/01/23
- [PULL 035/111] virtiofsd: passthrough_ll: add lo_map for ino/fh indirection, Dr. David Alan Gilbert (git), 2020/01/23