mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 09:55:55 +00:00
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: bc15e44cb2
("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>
This commit is contained in:
parent
a2547c1ba9
commit
a3f6be81aa
|
@ -1450,11 +1450,7 @@ trace_events_subdirs += [
|
||||||
'util',
|
'util',
|
||||||
]
|
]
|
||||||
|
|
||||||
vhost_user = not_found
|
subdir('contrib/libvhost-user')
|
||||||
if 'CONFIG_VHOST_USER' in config_host
|
|
||||||
subdir('contrib/libvhost-user')
|
|
||||||
endif
|
|
||||||
|
|
||||||
subdir('qapi')
|
subdir('qapi')
|
||||||
subdir('qobject')
|
subdir('qobject')
|
||||||
subdir('stubs')
|
subdir('stubs')
|
||||||
|
|
Loading…
Reference in a new issue