[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 31/34] build: move vhost-user-fs configuration to Kconfig
From: |
Paolo Bonzini |
Subject: |
[PATCH 31/34] build: move vhost-user-fs configuration to Kconfig |
Date: |
Wed, 20 Apr 2022 17:34:04 +0200 |
vhost-user-fs is a device and it should be possible to enable/disable
it with --without-default-devices, not --without-default-features.
Compute its default value in Kconfig to obtain the more intuitive
behavior.
In this case the configure options were undocumented, too.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 12 ------------
hw/virtio/Kconfig | 5 +++++
meson.build | 1 -
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
index 65ae2c0c1f..3b38ff3c63 100755
--- a/configure
+++ b/configure
@@ -286,7 +286,6 @@ vhost_kernel="$default_feature"
vhost_net="$default_feature"
vhost_crypto="$default_feature"
vhost_user="no"
-vhost_user_fs="$default_feature"
vhost_vdpa="$default_feature"
debug_tcg="no"
sanitizers="no"
@@ -872,10 +871,6 @@ for opt do
;;
--enable-vhost-crypto) vhost_crypto="yes"
;;
- --disable-vhost-user-fs) vhost_user_fs="no"
- ;;
- --enable-vhost-user-fs) vhost_user_fs="yes"
- ;;
--disable-zlib-test)
;;
--disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane)
@@ -1536,10 +1531,6 @@ test "$vhost_crypto" = "" && vhost_crypto=$vhost_user
if test "$vhost_crypto" = "yes" && test "$vhost_user" = "no"; then
error_exit "--enable-vhost-crypto requires --enable-vhost-user"
fi
-test "$vhost_user_fs" = "" && vhost_user_fs=$vhost_user
-if test "$vhost_user_fs" = "yes" && test "$vhost_user" = "no"; then
- error_exit "--enable-vhost-user-fs requires --enable-vhost-user"
-fi
# OR the vhost-kernel, vhost-vdpa and vhost-user values for simplicity
if test "$vhost_net" = ""; then
@@ -2088,9 +2079,6 @@ fi
if test "$vhost_vdpa" = "yes" ; then
echo "CONFIG_VHOST_VDPA=y" >> $config_host_mak
fi
-if test "$vhost_user_fs" = "yes" ; then
- echo "CONFIG_VHOST_USER_FS=y" >> $config_host_mak
-fi
# XXX: suppress that
if [ "$bsd" = "yes" ] ; then
diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig
index b642ae1081..f8e235f814 100644
--- a/hw/virtio/Kconfig
+++ b/hw/virtio/Kconfig
@@ -78,3 +78,8 @@ config VHOST_USER_RNG
bool
default y
depends on VIRTIO && VHOST_USER
+
+config VHOST_USER_FS
+ bool
+ default y
+ depends on VIRTIO && VHOST_USER
diff --git a/meson.build b/meson.build
index b18731ee84..870dd8dee0 100644
--- a/meson.build
+++ b/meson.build
@@ -3679,7 +3679,6 @@ summary_info += {'vhost-net support':
config_host.has_key('CONFIG_VHOST_NET')}
summary_info += {'vhost-crypto support':
config_host.has_key('CONFIG_VHOST_CRYPTO')}
summary_info += {'vhost-user support':
config_host.has_key('CONFIG_VHOST_USER')}
summary_info += {'vhost-user-blk server support': have_vhost_user_blk_server}
-summary_info += {'vhost-user-fs support':
config_host.has_key('CONFIG_VHOST_USER_FS')}
summary_info += {'vhost-vdpa support':
config_host.has_key('CONFIG_VHOST_VDPA')}
summary_info += {'build guest agent': have_ga}
summary(summary_info, bool_yn: true, section: 'Configurable features')
--
2.35.1
- Re: [PATCH 24/34] configure: switch directory options to automatic parsing, (continued)
- [PATCH 25/34] meson: pass more options directly as -D, Paolo Bonzini, 2022/04/20
- [PATCH 27/34] meson, virtio: place all virtio-pci devices under virtio_pci_ss, Paolo Bonzini, 2022/04/20
- [PATCH 28/34] configure: simplify vhost-net-{user, vdpa} configuration, Paolo Bonzini, 2022/04/20
- [PATCH 29/34] build: move vhost-vsock configuration to Kconfig, Paolo Bonzini, 2022/04/20
- [PATCH 31/34] build: move vhost-user-fs configuration to Kconfig,
Paolo Bonzini <=
- [PATCH 30/34] build: move vhost-scsi configuration to Kconfig, Paolo Bonzini, 2022/04/20
- [PATCH 32/34] meson: create have_vhost_* variables, Paolo Bonzini, 2022/04/20
- [PATCH 34/34] configure, meson: move vhost options to Meson, Paolo Bonzini, 2022/04/20
- [PATCH 33/34] meson: use have_vhost_* variables to pick sources, Paolo Bonzini, 2022/04/20