diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2020-11-25 14:06:37 +0400 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2020-12-08 13:48:58 -0500 |
| commit | 0df750e9d3a5fea5e19f4750582121c9293a9d71 (patch) | |
| tree | d1333e36fdf7bc7d8e5dbbbc8c7398748d6a2756 /tools/virtiofsd | |
| parent | 3d22bd27acd93281354b10c6bf787b720685eb80 (diff) | |
| download | qemu-0df750e9d3a5fea5e19f4750582121c9293a9d71.zip qemu-0df750e9d3a5fea5e19f4750582121c9293a9d71.tar.gz qemu-0df750e9d3a5fea5e19f4750582121c9293a9d71.tar.bz2 | |
libvhost-user: make it a meson subproject
By making libvhost-user a subproject, check it builds
standalone (without the global QEMU cflags etc).
Note that the library still relies on QEMU include/qemu/atomic.h and
linux_headers/.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20201125100640.366523-6-marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'tools/virtiofsd')
| -rw-r--r-- | tools/virtiofsd/fuse_virtio.c | 2 | ||||
| -rw-r--r-- | tools/virtiofsd/meson.build | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 83ba07c..623812c 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -35,7 +35,7 @@ #include <grp.h> #include <unistd.h> -#include "contrib/libvhost-user/libvhost-user.h" +#include "libvhost-user.h" struct fv_VuDev; struct fv_QueueInfo { diff --git a/tools/virtiofsd/meson.build b/tools/virtiofsd/meson.build index 17edecf..c134ba6 100644 --- a/tools/virtiofsd/meson.build +++ b/tools/virtiofsd/meson.build @@ -8,8 +8,7 @@ executable('virtiofsd', files( 'helper.c', 'passthrough_ll.c', 'passthrough_seccomp.c'), - link_with: libvhost_user, - dependencies: [seccomp, qemuutil, libcap_ng], + dependencies: [seccomp, qemuutil, libcap_ng, vhost_user], install: true, install_dir: get_option('libexecdir')) |