motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-09 00:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: move vhost-user-fs configuration to Kconfig

Browse source 
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.

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2022-04-20 17:34:04 +02:00
parent d13b200253
commit 5166dabf4f
3 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
configure vendored
View file

@ -286,7 +286,6 @@ vhost_kernel="$default_feature"
vhost_net="$default_feature" vhost_net="$default_feature"
vhost_crypto="$default_feature" vhost_crypto="$default_feature"
vhost_user="no" vhost_user="no"
vhost_user_fs="$default_feature"
vhost_vdpa="$default_feature" vhost_vdpa="$default_feature"
debug_tcg="no" debug_tcg="no"
sanitizers="no" sanitizers="no"
@ -873,10 +872,6 @@ for opt do
;; ;;
--enable-vhost-crypto) vhost_crypto="yes" --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-zlib-test)
;; ;;
--disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane) --disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane)
@ -1537,10 +1532,6 @@ test "$vhost_crypto" = "" && vhost_crypto=$vhost_user
if test "$vhost_crypto" = "yes" && test "$vhost_user" = "no"; then if test "$vhost_crypto" = "yes" && test "$vhost_user" = "no"; then
error_exit "--enable-vhost-crypto requires --enable-vhost-user" error_exit "--enable-vhost-crypto requires --enable-vhost-user"
fi 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 # OR the vhost-kernel, vhost-vdpa and vhost-user values for simplicity
if test "$vhost_net" = ""; then if test "$vhost_net" = ""; then
@ -2089,9 +2080,6 @@ fi
if test "$vhost_vdpa" = "yes" ; then if test "$vhost_vdpa" = "yes" ; then
echo "CONFIG_VHOST_VDPA=y" >> $config_host_mak echo "CONFIG_VHOST_VDPA=y" >> $config_host_mak
fi fi
if test "$vhost_user_fs" = "yes" ; then
echo "CONFIG_VHOST_USER_FS=y" >> $config_host_mak
fi
# XXX: suppress that # XXX: suppress that
if [ "$bsd" = "yes" ] ; then if [ "$bsd" = "yes" ] ; then

5
hw/virtio/Kconfig
View file

@ -78,3 +78,8 @@ config VHOST_USER_RNG
bool bool
default y default y
depends on VIRTIO && VHOST_USER depends on VIRTIO && VHOST_USER
config VHOST_USER_FS
bool
default y
depends on VIRTIO && VHOST_USER

1
meson.build
View file

@ -3693,7 +3693,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-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 support': config_host.has_key('CONFIG_VHOST_USER')}
summary_info += {'vhost-user-blk server support': have_vhost_user_blk_server} 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 += {'vhost-vdpa support': config_host.has_key('CONFIG_VHOST_VDPA')}
summary_info += {'build guest agent': have_ga} summary_info += {'build guest agent': have_ga}
summary(summary_info, bool_yn: true, section: 'Configurable features') summary(summary_info, bool_yn: true, section: 'Configurable features')