* [PULL v4 00/25] Misc patches for 2022-04-29
@ 2022-05-04 21:06 Paolo Bonzini
2022-05-04 21:06 ` [PULL 19/25] build: move vhost-vsock configuration to Kconfig Paolo Bonzini
2022-05-05 15:17 ` [PULL v4 00/25] Misc patches for 2022-04-29 Richard Henderson
0 siblings, 2 replies; 5+ messages in thread
From: Paolo Bonzini @ 2022-05-04 21:06 UTC (permalink / raw)
To: qemu-devel
The following changes since commit f5643914a9e8f79c606a76e6a9d7ea82a3fc3e65:
Merge tag 'pull-9p-20220501' of https://github.com/cschoenebeck/qemu into staging (2022-05-01 07:48:11 -0700)
are available in the Git repository at:
https://gitlab.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to ec7bd939178789b371df86276ba1d983f2de07ce:
pc: remove -soundhw pcspk (2022-05-01 23:06:15 +0200)
----------------------------------------------------------------
* WHPX support for xcr0
* qga-wss fixes
* Meson conversions
* Removed -soundhw pcspk
----------------------------------------------------------------
Konstantin Kostiuk (2):
configure: Add cross prefix for widl tool
qga-vss: always build qga-vss.tlb when qga-vss.dll is built
Paolo Bonzini (22):
meson-buildoptions: add support for string options
meson, configure: move Xen detection to meson
configure, meson: move iasl detection to meson
configure: move Windows flags detection to meson
configure: switch string options to automatic parsing
meson, configure: move --tls-priority to meson
meson, configure: move bdrv whitelists to meson
meson, configure: move --with-pkgversion, CONFIG_STAMP to meson
meson, configure: move --interp-prefix to meson
meson: always combine directories with prefix
configure: switch directory options to automatic parsing
meson: pass more options directly as -D
configure: omit options with default values from meson command line
meson, virtio: place all virtio-pci devices under virtio_pci_ss
configure: simplify vhost-net-{user, vdpa} configuration
build: move vhost-vsock configuration to Kconfig
build: move vhost-scsi configuration to Kconfig
build: move vhost-user-fs configuration to Kconfig
meson: create have_vhost_* variables
meson: use have_vhost_* variables to pick sources
configure, meson: move vhost options to Meson
pc: remove -soundhw pcspk
Sunil Muthuswamy (1):
WHPX: support for xcr0
Kconfig.host | 3 -
backends/meson.build | 8 +-
configure | 673 ++----------------------
docs/meson.build | 2 +-
hw/audio/pcspk.c | 10 -
hw/audio/soundhw.c | 27 +-
hw/net/meson.build | 8 +-
hw/scsi/Kconfig | 5 +
hw/virtio/Kconfig | 18 +-
hw/virtio/meson.build | 34 +-
include/hw/audio/soundhw.h | 3 -
include/hw/virtio/virtio-scsi.h | 2 -
meson.build | 256 ++++++---
meson_options.txt | 28 +-
net/meson.build | 12 +-
qga/vss-win32/meson.build | 4 +-
scripts/ci/org.centos/stream/8/x86_64/configure | 3 -
scripts/meson-buildoptions.py | 86 ++-
scripts/meson-buildoptions.sh | 74 ++-
scripts/qemu-stamp.py | 24 +
scripts/xen-detect.c | 203 +++++++
target/i386/whpx/whpx-all.c | 87 +++
target/i386/whpx/whpx-internal.h | 3 +
tests/meson.build | 2 +-
tests/qtest/meson.build | 4 +-
tools/meson.build | 2 +-
26 files changed, 776 insertions(+), 805 deletions(-)
create mode 100644 scripts/qemu-stamp.py
create mode 100644 scripts/xen-detect.c
--
2.35.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [PULL 19/25] build: move vhost-vsock configuration to Kconfig
2022-05-04 21:06 [PULL v4 00/25] Misc patches for 2022-04-29 Paolo Bonzini
@ 2022-05-04 21:06 ` Paolo Bonzini
2022-05-05 15:17 ` [PULL v4 00/25] Misc patches for 2022-04-29 Richard Henderson
1 sibling, 0 replies; 5+ messages in thread
From: Paolo Bonzini @ 2022-05-04 21:06 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
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>
---
configure | 16 ----------------
hw/virtio/Kconfig | 10 ++++++++++
meson.build | 1 -
scripts/ci/org.centos/stream/8/x86_64/configure | 2 --
4 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/configure b/configure
index d6ddd4f05f..603434fc7f 100755
--- a/configure
+++ b/configure
@@ -286,7 +286,6 @@ vhost_kernel="$default_feature"
vhost_net="$default_feature"
vhost_crypto="$default_feature"
vhost_scsi="$default_feature"
-vhost_vsock="$default_feature"
vhost_user="no"
vhost_user_fs="$default_feature"
vhost_vdpa="$default_feature"
@@ -879,10 +878,6 @@ for opt do
;;
--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"
;;
--enable-vhost-user-fs) vhost_user_fs="yes"
@@ -1109,7 +1104,6 @@ cat << EOF
safe-stack SafeStack Stack Smash Protection. Depends on
clang/llvm >= 3.7 and requires coroutine backend ucontext.
vhost-net vhost-net kernel acceleration support
- vhost-vsock virtio sockets device support
vhost-scsi vhost-scsi kernel target support
vhost-crypto vhost-user-crypto 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
error_exit "--enable-vhost-scsi requires --enable-vhost-kernel"
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
test "$vhost_crypto" = "" && vhost_crypto=$vhost_user
@@ -2105,12 +2095,6 @@ fi
if test "$vhost_crypto" = "yes" ; then
echo "CONFIG_VHOST_CRYPTO=y" >> $config_host_mak
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
echo "CONFIG_VHOST_KERNEL=y" >> $config_host_mak
fi
diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig
index c144d42f9b..b642ae1081 100644
--- a/hw/virtio/Kconfig
+++ b/hw/virtio/Kconfig
@@ -59,6 +59,16 @@ config VIRTIO_MEM
depends on VIRTIO_MEM_SUPPORTED
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
bool
default y
diff --git a/meson.build b/meson.build
index 7c52ef135c..8621f84916 100644
--- a/meson.build
+++ b/meson.build
@@ -3691,7 +3691,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-crypto support': config_host.has_key('CONFIG_VHOST_CRYPTO')}
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-blk server support': have_vhost_user_blk_server}
summary_info += {'vhost-user-fs support': config_host.has_key('CONFIG_VHOST_USER_FS')}
diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/8/x86_64/configure
index 08225ee514..e6ac2e5877 100755
--- a/scripts/ci/org.centos/stream/8/x86_64/configure
+++ b/scripts/ci/org.centos/stream/8/x86_64/configure
@@ -136,7 +136,6 @@
--disable-vhost-user \
--disable-vhost-user-blk-server \
--disable-vhost-vdpa \
---disable-vhost-vsock \
--disable-virglrenderer \
--disable-virtfs \
--disable-virtiofsd \
@@ -198,7 +197,6 @@
--enable-vhost-user \
--enable-vhost-user-blk-server \
--enable-vhost-vdpa \
---enable-vhost-vsock \
--enable-vnc \
--enable-png \
--enable-vnc-sasl \
--
2.35.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PULL v4 00/25] Misc patches for 2022-04-29
2022-05-04 21:06 [PULL v4 00/25] Misc patches for 2022-04-29 Paolo Bonzini
2022-05-04 21:06 ` [PULL 19/25] build: move vhost-vsock configuration to Kconfig Paolo Bonzini
@ 2022-05-05 15:17 ` Richard Henderson
2022-05-05 17:19 ` Paolo Bonzini
1 sibling, 1 reply; 5+ messages in thread
From: Richard Henderson @ 2022-05-05 15:17 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
On 5/4/22 16:06, Paolo Bonzini wrote:
> The following changes since commit f5643914a9e8f79c606a76e6a9d7ea82a3fc3e65:
>
> Merge tag 'pull-9p-20220501' of https://github.com/cschoenebeck/qemu into staging (2022-05-01 07:48:11 -0700)
>
> are available in the Git repository at:
>
> https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to ec7bd939178789b371df86276ba1d983f2de07ce:
>
> pc: remove -soundhw pcspk (2022-05-01 23:06:15 +0200)
>
> ----------------------------------------------------------------
> * WHPX support for xcr0
> * qga-wss fixes
> * Meson conversions
> * Removed -soundhw pcspk
>
> ----------------------------------------------------------------
> Konstantin Kostiuk (2):
> configure: Add cross prefix for widl tool
> qga-vss: always build qga-vss.tlb when qga-vss.dll is built
>
> Paolo Bonzini (22):
> meson-buildoptions: add support for string options
> meson, configure: move Xen detection to meson
> configure, meson: move iasl detection to meson
> configure: move Windows flags detection to meson
> configure: switch string options to automatic parsing
> meson, configure: move --tls-priority to meson
> meson, configure: move bdrv whitelists to meson
> meson, configure: move --with-pkgversion, CONFIG_STAMP to meson
> meson, configure: move --interp-prefix to meson
> meson: always combine directories with prefix
> configure: switch directory options to automatic parsing
> meson: pass more options directly as -D
> configure: omit options with default values from meson command line
> meson, virtio: place all virtio-pci devices under virtio_pci_ss
> configure: simplify vhost-net-{user, vdpa} configuration
> build: move vhost-vsock configuration to Kconfig
> build: move vhost-scsi configuration to Kconfig
> build: move vhost-user-fs configuration to Kconfig
> meson: create have_vhost_* variables
> meson: use have_vhost_* variables to pick sources
> configure, meson: move vhost options to Meson
> pc: remove -soundhw pcspk
>
> Sunil Muthuswamy (1):
> WHPX: support for xcr0
>
> Kconfig.host | 3 -
> backends/meson.build | 8 +-
> configure | 673 ++----------------------
> docs/meson.build | 2 +-
> hw/audio/pcspk.c | 10 -
> hw/audio/soundhw.c | 27 +-
> hw/net/meson.build | 8 +-
> hw/scsi/Kconfig | 5 +
> hw/virtio/Kconfig | 18 +-
> hw/virtio/meson.build | 34 +-
> include/hw/audio/soundhw.h | 3 -
> include/hw/virtio/virtio-scsi.h | 2 -
> meson.build | 256 ++++++---
> meson_options.txt | 28 +-
> net/meson.build | 12 +-
> qga/vss-win32/meson.build | 4 +-
> scripts/ci/org.centos/stream/8/x86_64/configure | 3 -
> scripts/meson-buildoptions.py | 86 ++-
> scripts/meson-buildoptions.sh | 74 ++-
> scripts/qemu-stamp.py | 24 +
> scripts/xen-detect.c | 203 +++++++
> target/i386/whpx/whpx-all.c | 87 +++
> target/i386/whpx/whpx-internal.h | 3 +
> tests/meson.build | 2 +-
> tests/qtest/meson.build | 4 +-
> tools/meson.build | 2 +-
> 26 files changed, 776 insertions(+), 805 deletions(-)
> create mode 100644 scripts/qemu-stamp.py
> create mode 100644 scripts/xen-detect.c
New errors today:
In file included from
/home/gitlab-runner/builds/Jpwtyaz7/0/qemu-project/qemu/include/qemu/osdep.h:30,
from ../block.c:26:
../block.c: In function ‘bdrv_format_is_whitelisted’:
./config-host.h:44:163: error: called object is not a function or function pointer
#define CONFIG_BDRV_RW_WHITELIST "qcow2", "raw", "file", "host_device", "nbd", "iscsi",
"rbd", "blkdebug", "luks", "null-co", "nvme", "copy-on-read", "throttle", "gluster"
^~~~~~~~~
../block.c:478:9: note: in expansion of macro ‘CONFIG_BDRV_RW_WHITELIST’
CONFIG_BDRV_RW_WHITELIST
^~~~~~~~~~~~~~~~~~~~~~~~
In file included from
/home/gitlab-runner/builds/Jpwtyaz7/0/qemu-project/qemu/include/qemu/osdep.h:30,
from ../block.c:26:
./config-host.h:42:66: error: called object is not a function or function pointer
#define CONFIG_BDRV_RO_WHITELIST "vmdk", "vhdx", "vpc", "https", "ssh"
^~~~~
../block.c:482:9: note: in expansion of macro ‘CONFIG_BDRV_RO_WHITELIST’
CONFIG_BDRV_RO_WHITELIST
^~~~~~~~~~~~~~~~~~~~~~~~
https://gitlab.com/qemu-project/qemu/-/jobs/2418086124
r~
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PULL v4 00/25] Misc patches for 2022-04-29
2022-05-05 15:17 ` [PULL v4 00/25] Misc patches for 2022-04-29 Richard Henderson
@ 2022-05-05 17:19 ` Paolo Bonzini
0 siblings, 0 replies; 5+ messages in thread
From: Paolo Bonzini @ 2022-05-05 17:19 UTC (permalink / raw)
To: Richard Henderson, qemu-devel
On 5/5/22 17:17, Richard Henderson wrote:
> In file included from
> /home/gitlab-runner/builds/Jpwtyaz7/0/qemu-project/qemu/include/qemu/osdep.h:30,
>
> from ../block.c:26:
> ../block.c: In function ‘bdrv_format_is_whitelisted’:
> ./config-host.h:44:163: error: called object is not a function or
> function pointer
> #define CONFIG_BDRV_RW_WHITELIST "qcow2", "raw", "file",
> "host_device", "nbd", "iscsi", "rbd", "blkdebug", "luks", "null-co",
> "nvme", "copy-on-read", "throttle", "gluster"
>
> ^~~~~~~~~
> ../block.c:478:9: note: in expansion of macro ‘CONFIG_BDRV_RW_WHITELIST’
> CONFIG_BDRV_RW_WHITELIST
> ^~~~~~~~~~~~~~~~~~~~~~~~
> In file included from
> /home/gitlab-runner/builds/Jpwtyaz7/0/qemu-project/qemu/include/qemu/osdep.h:30,
>
> from ../block.c:26:
> ./config-host.h:42:66: error: called object is not a function or
> function pointer
> #define CONFIG_BDRV_RO_WHITELIST "vmdk", "vhdx", "vpc", "https", "ssh"
> ^~~~~
> ../block.c:482:9: note: in expansion of macro ‘CONFIG_BDRV_RO_WHITELIST’
> CONFIG_BDRV_RO_WHITELIST
> ^~~~~~~~~~~~~~~~~~~~~~~~
>
> https://gitlab.com/qemu-project/qemu/-/jobs/2418086124
I'm really sorry. At least this should have been caught by the
contributor CI though, I'll send a patch.
Paolo
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PULL 00/25] Misc patches for 2022-04-29
@ 2022-04-29 15:22 Paolo Bonzini
2022-04-29 15:23 ` [PULL 19/25] build: move vhost-vsock configuration to Kconfig Paolo Bonzini
0 siblings, 1 reply; 5+ messages in thread
From: Paolo Bonzini @ 2022-04-29 15:22 UTC (permalink / raw)
To: qemu-devel
The following changes since commit f22833602095b05733bceaddeb20f3edfced3c07:
Merge tag 'pull-target-arm-20220428' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2022-04-28 08:34:17 -0700)
are available in the Git repository at:
https://gitlab.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to ec31a2f9b5b128c06a499ad076d8b29d664d3896:
pc: remove -soundhw pcspk (2022-04-29 15:07:21 +0200)
----------------------------------------------------------------
* WHPX support for xcr0
* qga-wss fixes
* Meson conversions
* Removed -soundhw pcspk
----------------------------------------------------------------
Konstantin Kostiuk (2):
configure: Add cross prefix for widl tool
qga-vss: always build qga-vss.tlb when qga-vss.dll is built
Paolo Bonzini (22):
meson-buildoptions: add support for string options
meson, configure: move Xen detection to meson
configure, meson: move iasl detection to meson
configure: move Windows flags detection to meson
configure: switch string options to automatic parsing
meson, configure: move --tls-priority to meson
meson, configure: move bdrv whitelists to meson
meson, configure: move --with-pkgversion, CONFIG_STAMP to meson
meson, configure: move --interp-prefix to meson
meson: always combine directories with prefix
configure: switch directory options to automatic parsing
meson: pass more options directly as -D
configure: omit options with default values from meson command line
meson, virtio: place all virtio-pci devices under virtio_pci_ss
configure: simplify vhost-net-{user, vdpa} configuration
build: move vhost-vsock configuration to Kconfig
build: move vhost-scsi configuration to Kconfig
build: move vhost-user-fs configuration to Kconfig
meson: create have_vhost_* variables
meson: use have_vhost_* variables to pick sources
configure, meson: move vhost options to Meson
pc: remove -soundhw pcspk
Sunil Muthuswamy (1):
WHPX: support for xcr0
Kconfig.host | 3 -
backends/meson.build | 8 +-
configure | 673 ++-------------------------------------
docs/meson.build | 2 +-
hw/audio/pcspk.c | 10 -
hw/audio/soundhw.c | 27 +-
hw/net/meson.build | 8 +-
hw/scsi/Kconfig | 5 +
hw/virtio/Kconfig | 18 +-
hw/virtio/meson.build | 34 +-
include/hw/audio/soundhw.h | 3 -
include/hw/virtio/virtio-scsi.h | 2 -
meson.build | 256 +++++++++++----
meson_options.txt | 28 +-
net/meson.build | 12 +-
qga/vss-win32/meson.build | 4 +-
scripts/meson-buildoptions.py | 86 ++++-
scripts/meson-buildoptions.sh | 74 ++++-
scripts/qemu-stamp.py | 24 ++
scripts/xen-detect.c | 203 ++++++++++++
target/i386/whpx/whpx-all.c | 89 ++++++
target/i386/whpx/whpx-internal.h | 3 +
tests/meson.build | 2 +-
tests/qtest/meson.build | 4 +-
tools/meson.build | 2 +-
25 files changed, 778 insertions(+), 802 deletions(-)
create mode 100644 scripts/qemu-stamp.py
create mode 100644 scripts/xen-detect.c
--
2.35.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [PULL 19/25] build: move vhost-vsock configuration to Kconfig
2022-04-29 15:22 [PULL " Paolo Bonzini
@ 2022-04-29 15:23 ` Paolo Bonzini
0 siblings, 0 replies; 5+ messages in thread
From: Paolo Bonzini @ 2022-04-29 15:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
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>
---
configure | 16 ----------------
hw/virtio/Kconfig | 10 ++++++++++
meson.build | 1 -
3 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/configure b/configure
index d6ddd4f05f..603434fc7f 100755
--- a/configure
+++ b/configure
@@ -286,7 +286,6 @@ vhost_kernel="$default_feature"
vhost_net="$default_feature"
vhost_crypto="$default_feature"
vhost_scsi="$default_feature"
-vhost_vsock="$default_feature"
vhost_user="no"
vhost_user_fs="$default_feature"
vhost_vdpa="$default_feature"
@@ -879,10 +878,6 @@ for opt do
;;
--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"
;;
--enable-vhost-user-fs) vhost_user_fs="yes"
@@ -1109,7 +1104,6 @@ cat << EOF
safe-stack SafeStack Stack Smash Protection. Depends on
clang/llvm >= 3.7 and requires coroutine backend ucontext.
vhost-net vhost-net kernel acceleration support
- vhost-vsock virtio sockets device support
vhost-scsi vhost-scsi kernel target support
vhost-crypto vhost-user-crypto 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
error_exit "--enable-vhost-scsi requires --enable-vhost-kernel"
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
test "$vhost_crypto" = "" && vhost_crypto=$vhost_user
@@ -2105,12 +2095,6 @@ fi
if test "$vhost_crypto" = "yes" ; then
echo "CONFIG_VHOST_CRYPTO=y" >> $config_host_mak
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
echo "CONFIG_VHOST_KERNEL=y" >> $config_host_mak
fi
diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig
index c144d42f9b..b642ae1081 100644
--- a/hw/virtio/Kconfig
+++ b/hw/virtio/Kconfig
@@ -59,6 +59,16 @@ config VIRTIO_MEM
depends on VIRTIO_MEM_SUPPORTED
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
bool
default y
diff --git a/meson.build b/meson.build
index 7c52ef135c..8621f84916 100644
--- a/meson.build
+++ b/meson.build
@@ -3691,7 +3691,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-crypto support': config_host.has_key('CONFIG_VHOST_CRYPTO')}
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-blk server support': have_vhost_user_blk_server}
summary_info += {'vhost-user-fs support': config_host.has_key('CONFIG_VHOST_USER_FS')}
--
2.35.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-05-05 18:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-04 21:06 [PULL v4 00/25] Misc patches for 2022-04-29 Paolo Bonzini
2022-05-04 21:06 ` [PULL 19/25] build: move vhost-vsock configuration to Kconfig Paolo Bonzini
2022-05-05 15:17 ` [PULL v4 00/25] Misc patches for 2022-04-29 Richard Henderson
2022-05-05 17:19 ` Paolo Bonzini
-- strict thread matches above, loose matches on Subject: below --
2022-04-29 15:22 [PULL " Paolo Bonzini
2022-04-29 15:23 ` [PULL 19/25] build: move vhost-vsock configuration to Kconfig Paolo Bonzini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.