[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 3/7] vhost-user-blk-server: depend on CONFIG_VHOST_USER
From: |
Michael S. Tsirkin |
Subject: |
[PULL v2 3/7] vhost-user-blk-server: depend on CONFIG_VHOST_USER |
Date: |
Tue, 17 Nov 2020 04:19:05 -0500 |
From: Stefan Hajnoczi <stefanha@redhat.com>
I interpreted CONFIG_VHOST_USER as controlling only QEMU's vhost-user
device frontends. However, virtiofsd and contrib/ vhost-user device
backends are also controlled by CONFIG_VHOST_USER. Make the
vhost-user-blk server depend on CONFIG_VHOST_USER for consistency.
Now the following error is printed when the vhost-user-blk server is
enabled without CONFIG_VHOST_USER:
$ ./configure --disable-vhost-user --enable-vhost-user-blk ...
../meson.build:761:8: ERROR: Problem encountered: vhost_user_blk_server
requires vhost-user support
Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Suggested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20201110171121.1265142-3-stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
meson.build | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 4b789f18c1..7fd874eec7 100644
--- a/meson.build
+++ b/meson.build
@@ -751,11 +751,14 @@ statx_test = '''
has_statx = cc.links(statx_test)
-have_vhost_user_blk_server = (targetos == 'linux')
+have_vhost_user_blk_server = (targetos == 'linux' and
+ 'CONFIG_VHOST_USER' in config_host)
if get_option('vhost_user_blk_server').enabled()
if targetos != 'linux'
error('vhost_user_blk_server requires linux')
+ elif 'CONFIG_VHOST_USER' not in config_host
+ error('vhost_user_blk_server requires vhost-user support')
endif
elif get_option('vhost_user_blk_server').disabled() or not have_system
have_vhost_user_blk_server = false
--
MST
- [PULL v2 0/7] pc,vhost: fixes, Michael S. Tsirkin, 2020/11/17
- [PULL v2 1/7] vhost-user: fix VHOST_USER_ADD/REM_MEM_REG truncation, Michael S. Tsirkin, 2020/11/17
- [PULL v2 2/7] meson: move vhost_user_blk_server to meson.build, Michael S. Tsirkin, 2020/11/17
- [PULL v2 3/7] vhost-user-blk-server: depend on CONFIG_VHOST_USER,
Michael S. Tsirkin <=
- [PULL v2 4/7] configure: mark vhost-user Linux-only, Michael S. Tsirkin, 2020/11/17
- [PULL v2 5/7] hw/i386/acpi-build: Fix maybe-uninitialized error when ACPI hotplug off, Michael S. Tsirkin, 2020/11/17
- [PULL v2 6/7] contrib/libvhost-user: Fix bad printf format specifiers, Michael S. Tsirkin, 2020/11/17
- [PULL v2 7/7] vhost-user-blk/scsi: Fix broken error handling for socket call, Michael S. Tsirkin, 2020/11/17
- Re: [PULL v2 0/7] pc,vhost: fixes, Peter Maydell, 2020/11/17