diff options
| author | Paolo Bonzini | 2020-02-05 09:45:39 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2020-08-21 12:30:09 +0200 |
| commit | 3f99cf5710d77ce218116d1b6bb9682c466bbde1 (patch) | |
| tree | b03f11959ec3ad2d2e206965c02c16d7f7e2d9a6 /tools/virtiofsd | |
| parent | contrib/libvhost-user: convert to Meson (diff) | |
| download | qemu-3f99cf5710d77ce218116d1b6bb9682c466bbde1.tar.gz qemu-3f99cf5710d77ce218116d1b6bb9682c466bbde1.tar.xz qemu-3f99cf5710d77ce218116d1b6bb9682c466bbde1.zip | |
tools/virtiofsd: convert to Meson
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tools/virtiofsd')
| -rw-r--r-- | tools/virtiofsd/Makefile.objs | 12 | ||||
| -rw-r--r-- | tools/virtiofsd/meson.build | 19 | ||||
| -rw-r--r-- | tools/virtiofsd/passthrough_ll.c | 2 | ||||
| -rw-r--r-- | tools/virtiofsd/passthrough_seccomp.c (renamed from tools/virtiofsd/seccomp.c) | 2 | ||||
| -rw-r--r-- | tools/virtiofsd/passthrough_seccomp.h (renamed from tools/virtiofsd/seccomp.h) | 0 |
5 files changed, 21 insertions, 14 deletions
diff --git a/tools/virtiofsd/Makefile.objs b/tools/virtiofsd/Makefile.objs deleted file mode 100644 index 076f667e46..0000000000 --- a/tools/virtiofsd/Makefile.objs +++ /dev/null @@ -1,12 +0,0 @@ -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 \ - seccomp.o - -seccomp.o-cflags := $(SECCOMP_CFLAGS) -seccomp.o-libs := $(SECCOMP_LIBS) diff --git a/tools/virtiofsd/meson.build b/tools/virtiofsd/meson.build new file mode 100644 index 0000000000..d1e23c5760 --- /dev/null +++ b/tools/virtiofsd/meson.build @@ -0,0 +1,19 @@ +executable('virtiofsd', files( + 'buffer.c', + 'fuse_opt.c', + 'fuse_log.c', + 'fuse_lowlevel.c', + 'fuse_signals.c', + 'fuse_virtio.c', + 'helper.c', + 'passthrough_ll.c', + 'passthrough_seccomp.c'), + link_with: libvhost_user, + dependencies: [seccomp, qemuutil, libcap_ng], + install: true, + install_dir: get_option('libexecdir')) + +configure_file(input: '50-qemu-virtiofsd.json.in', + output: '50-qemu-virtiofsd.json', + configuration: config_host, + install_dir: config_host['qemu_datadir'] / 'vhost-user') diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c index 94e0de2d2b..63d1d00565 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -65,7 +65,7 @@ #include <unistd.h> #include "passthrough_helpers.h" -#include "seccomp.h" +#include "passthrough_seccomp.h" /* Keep track of inode posix locks for each owner. */ struct lo_inode_plock { diff --git a/tools/virtiofsd/seccomp.c b/tools/virtiofsd/passthrough_seccomp.c index 3b1522acdd..19fee60011 100644 --- a/tools/virtiofsd/seccomp.c +++ b/tools/virtiofsd/passthrough_seccomp.c @@ -7,7 +7,7 @@ */ #include "qemu/osdep.h" -#include "seccomp.h" +#include "passthrough_seccomp.h" #include "fuse_i.h" #include "fuse_log.h" #include <errno.h> diff --git a/tools/virtiofsd/seccomp.h b/tools/virtiofsd/passthrough_seccomp.h index d47c8eade6..d47c8eade6 100644 --- a/tools/virtiofsd/seccomp.h +++ b/tools/virtiofsd/passthrough_seccomp.h |