OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

build: move vhost-vsock configuration to Kconfig

Browse Source 
vhost-vsock and vhost-user-vsock are two devices of their own; it should
be possible to enable/disable them with --without-default-devices, not
--without-default-features.  Compute their default value in Kconfig to
obtain the more intuitive behavior.

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:02 +02:00
parent 5e7b5ebaec
commit 9972ae314f
4 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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_scsi="$default_feature" vhost_scsi="$default_feature"
vhost_vsock="$default_feature"
vhost_user="no" vhost_user="no"
vhost_user_fs="$default_feature" vhost_user_fs="$default_feature"
vhost_vdpa="$default_feature" vhost_vdpa="$default_feature"
@ -879,10 +878,6 @@ for opt do
;; ;;
--enable-vhost-scsi) vhost_scsi="yes" --enable-vhost-scsi) vhost_scsi="yes"
;; ;;
--disable-vhost-vsock) vhost_vsock="no"
;;
--enable-vhost-vsock) vhost_vsock="yes"
;;
--disable-vhost-user-fs) vhost_user_fs="no" --disable-vhost-user-fs) vhost_user_fs="no"
;; ;;
--enable-vhost-user-fs) vhost_user_fs="yes" --enable-vhost-user-fs) vhost_user_fs="yes"
@ -1109,7 +1104,6 @@ cat << EOF
safe-stack SafeStack Stack Smash Protection. Depends on safe-stack SafeStack Stack Smash Protection. Depends on
clang/llvm >= 3.7 and requires coroutine backend ucontext. clang/llvm >= 3.7 and requires coroutine backend ucontext.
vhost-net vhost-net kernel acceleration support vhost-net vhost-net kernel acceleration support
vhost-vsock virtio sockets device support
vhost-scsi vhost-scsi kernel target support vhost-scsi vhost-scsi kernel target support
vhost-crypto vhost-user-crypto backend support vhost-crypto vhost-user-crypto backend support
vhost-kernel vhost kernel backend support vhost-kernel vhost kernel backend support
@ -1549,10 +1543,6 @@ test "$vhost_scsi" = "" && vhost_scsi=$vhost_kernel
if test "$vhost_scsi" = "yes" && test "$vhost_kernel" != "yes"; then if test "$vhost_scsi" = "yes" && test "$vhost_kernel" != "yes"; then
error_exit "--enable-vhost-scsi requires --enable-vhost-kernel" error_exit "--enable-vhost-scsi requires --enable-vhost-kernel"
fi fi
test "$vhost_vsock" = "" && vhost_vsock=$vhost_kernel
if test "$vhost_vsock" = "yes" && test "$vhost_kernel" != "yes"; then
error_exit "--enable-vhost-vsock requires --enable-vhost-kernel"
fi
# vhost-user backends # vhost-user backends
test "$vhost_crypto" = "" && vhost_crypto=$vhost_user test "$vhost_crypto" = "" && vhost_crypto=$vhost_user
@ -2105,12 +2095,6 @@ fi
if test "$vhost_crypto" = "yes" ; then if test "$vhost_crypto" = "yes" ; then
echo "CONFIG_VHOST_CRYPTO=y" >> $config_host_mak echo "CONFIG_VHOST_CRYPTO=y" >> $config_host_mak
fi fi
if test "$vhost_vsock" = "yes" ; then
echo "CONFIG_VHOST_VSOCK=y" >> $config_host_mak
if test "$vhost_user" = "yes" ; then
echo "CONFIG_VHOST_USER_VSOCK=y" >> $config_host_mak
fi
fi
if test "$vhost_kernel" = "yes" ; then if test "$vhost_kernel" = "yes" ; then
echo "CONFIG_VHOST_KERNEL=y" >> $config_host_mak echo "CONFIG_VHOST_KERNEL=y" >> $config_host_mak
fi fi

10
hw/virtio/Kconfig
View File

@ -59,6 +59,16 @@ config VIRTIO_MEM
depends on VIRTIO_MEM_SUPPORTED depends on VIRTIO_MEM_SUPPORTED
select MEM_DEVICE select MEM_DEVICE
config VHOST_VSOCK
bool
default y
depends on VIRTIO && VHOST_KERNEL
config VHOST_USER_VSOCK
bool
default y
depends on VIRTIO && VHOST_USER
config VHOST_USER_I2C config VHOST_USER_I2C
bool bool
default y default y

1
meson.build
View File

@ -3692,7 +3692,6 @@ summary_info += {'vhost-kernel support': config_host.has_key('CONFIG_VHOST_KERNE
summary_info += {'vhost-net support': config_host.has_key('CONFIG_VHOST_NET')} 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-scsi support': config_host.has_key('CONFIG_VHOST_SCSI')} summary_info += {'vhost-scsi support': config_host.has_key('CONFIG_VHOST_SCSI')}
summary_info += {'vhost-vsock support': config_host.has_key('CONFIG_VHOST_VSOCK')}
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-user-fs support': config_host.has_key('CONFIG_VHOST_USER_FS')}

2
scripts/ci/org.centos/stream/8/x86_64/configure vendored
View File

@ -136,7 +136,6 @@
--disable-vhost-user \ --disable-vhost-user \
--disable-vhost-user-blk-server \ --disable-vhost-user-blk-server \
--disable-vhost-vdpa \ --disable-vhost-vdpa \
--disable-vhost-vsock \
--disable-virglrenderer \ --disable-virglrenderer \
--disable-virtfs \ --disable-virtfs \
--disable-virtiofsd \ --disable-virtiofsd \
@ -198,7 +197,6 @@
--enable-vhost-user \ --enable-vhost-user \
--enable-vhost-user-blk-server \ --enable-vhost-user-blk-server \
--enable-vhost-vdpa \ --enable-vhost-vdpa \
--enable-vhost-vsock \
--enable-vnc \ --enable-vnc \
--enable-png \ --enable-png \
--enable-vnc-sasl \ --enable-vnc-sasl \