diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2020-11-06 21:03:40 +0000 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2020-11-09 18:34:21 +0100 |
| commit | a3f6be81aa95f4f80504face9bc6de6d2dc1743f (patch) | |
| tree | 1c0d89befb43ba6340a6247d46479543c359a034 | |
| parent | a2547c1ba911a0c53a10fe02d94a0f539dc064cc (diff) | |
| download | qemu-a3f6be81aa95f4f80504face9bc6de6d2dc1743f.zip qemu-a3f6be81aa95f4f80504face9bc6de6d2dc1743f.tar.gz qemu-a3f6be81aa95f4f80504face9bc6de6d2dc1743f.tar.bz2 | |
meson: always include contrib/libvhost-user
libvhost-user is needed when CONFIG_LINUX is set. The CONFIG_VHOST_USER
check in meson.build is incorrect.
In fact, no explicit check is needed since this dependency is not built
by default. If something declares a dependency on libvhost-user then it
will be built, otherwise it won't be built (i.e. on non-Linux hosts).
This fixes ./configure --disable-vhost-user && make.
Fixes: bc15e44cb2191bbb2318878acdf5038134e56394 ("configure: introduce --enable-vhost-user-blk-server")
Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reported-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20201106210340.698771-1-stefanha@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | meson.build | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/meson.build b/meson.build index f517501..b473620 100644 --- a/meson.build +++ b/meson.build @@ -1450,11 +1450,7 @@ trace_events_subdirs += [ 'util', ] -vhost_user = not_found -if 'CONFIG_VHOST_USER' in config_host - subdir('contrib/libvhost-user') -endif - +subdir('contrib/libvhost-user') subdir('qapi') subdir('qobject') subdir('stubs') |