[PATCH 33/38] qemu: capabilities: Retire QEMU_CAPS_VHOSTUSER_MULTIQUEUE

All supported qemus have it, there isn't an elegant way to detect it and it's unlikely to be ever removed on purpose. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_domain.c | 11 +---------- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 6 ++---- 40 files changed, 4 insertions(+), 52 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5a745c15c8..982de16378 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5012,7 +5012,6 @@ void virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps) { /* Following caps were asserted by a version check for pre 2.11 qemus */ - virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL_GL); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 4e9c3c55f3..e5145abe36 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -308,7 +308,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_DEA_KEY_WRAP, /* -machine dea_key_wrap */ QEMU_CAPS_DEVICE_PCI_SERIAL, /* -device pci-serial */ QEMU_CAPS_CPU_AARCH64_OFF, /* -cpu ...,aarch64=off */ - QEMU_CAPS_VHOSTUSER_MULTIQUEUE, /* vhost-user with -netdev queues= */ + X_QEMU_CAPS_VHOSTUSER_MULTIQUEUE, /* vhost-user with -netdev queues= */ QEMU_CAPS_MIGRATION_EVENT, /* MIGRATION event */ /* 190 */ diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2c8ea39840..1e993312a2 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4566,7 +4566,7 @@ qemuDomainDefPostParse(virDomainDef *def, int qemuDomainValidateActualNetDef(const virDomainNetDef *net, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { /* * Validations that can only be properly checked at runtime (after @@ -4602,15 +4602,6 @@ qemuDomainValidateActualNetDef(const virDomainNetDef *net, macstr, virDomainNetTypeToString(actualType)); return -1; } - - if (net->driver.virtio.queues > 1 && - actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("interface %s - multiqueue is not supported for network interfaces of type vhost-user with this QEMU binary"), - macstr); - return -1; - } } /* diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 93c4a11e4b..474f1935d5 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -43,7 +43,6 @@ <flag name='drive-iotune-max'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='virtio-net'/> <flag name='incoming-defer'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 12dfd4b259..a39bca2c9d 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -91,7 +91,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='ioh3420'/> <flag name='x3130-upstream'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 1c66bfa1e9..fea3c44ed1 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -68,7 +68,6 @@ <flag name='dea-key-wrap'/> <flag name='pci-serial'/> <flag name='aarch64-off'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='gpex-pcihost'/> <flag name='ioh3420'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index f9e6a5f89e..6e46222722 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -67,7 +67,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='rtl8139'/> <flag name='e1000'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index ef00d22c80..12731c0a70 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -43,7 +43,6 @@ <flag name='drive-iotune-max'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='virtio-net'/> <flag name='incoming-defer'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 5206d893a8..9d14174285 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -91,7 +91,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='ioh3420'/> <flag name='x3130-upstream'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 16132ce3bc..092408902b 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -66,7 +66,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='rtl8139'/> <flag name='e1000'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index f7a9cd6db2..b893c77708 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -33,7 +33,6 @@ <flag name='drive-iotune-max'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='virtio-net'/> <flag name='incoming-defer'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index 2079932c09..a6fba0d9a1 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -33,7 +33,6 @@ <flag name='drive-iotune-max'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='virtio-net'/> <flag name='incoming-defer'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index 330fbf20a1..243dcb44ca 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -44,7 +44,6 @@ <flag name='drive-iotune-max'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='virtio-net'/> <flag name='incoming-defer'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 52b1a11230..7d22a411ad 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -90,7 +90,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='ioh3420'/> <flag name='x3130-upstream'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 324e50d032..717afeccc3 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -67,7 +67,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='rtl8139'/> <flag name='e1000'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 18199e517e..b7125773f0 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -90,7 +90,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='ioh3420'/> <flag name='x3130-upstream'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml index 692ed9a8b5..5dd197e63d 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -70,7 +70,6 @@ <flag name='dea-key-wrap'/> <flag name='pci-serial'/> <flag name='aarch64-off'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='gpex-pcihost'/> <flag name='ioh3420'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml index 56ef18f9e2..394c440701 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -69,7 +69,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='ioh3420'/> <flag name='x3130-upstream'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index aaf5c847e5..c83888cc59 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -73,7 +73,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='gpex-pcihost'/> <flag name='ioh3420'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 6b23827eac..f55bd4841f 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -73,7 +73,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='gpex-pcihost'/> <flag name='ioh3420'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml index 1a3bcc381c..f706579d5d 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -44,7 +44,6 @@ <flag name='drive-iotune-max'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='virtio-net'/> <flag name='incoming-defer'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index e89d55428a..2209956a79 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -89,7 +89,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='ioh3420'/> <flag name='x3130-upstream'/> diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index bd8ca8a368..cd05913ebb 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -89,7 +89,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='ioh3420'/> <flag name='x3130-upstream'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index fcea29ad95..d968d4574c 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -71,7 +71,6 @@ <flag name='dea-key-wrap'/> <flag name='pci-serial'/> <flag name='aarch64-off'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='gpex-pcihost'/> <flag name='ioh3420'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index b7b855bdb7..c0e39b41b9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -69,7 +69,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='ioh3420'/> <flag name='x3130-upstream'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index ab25e68b27..543c800585 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -44,7 +44,6 @@ <flag name='drive-iotune-max'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='virtio-net'/> <flag name='incoming-defer'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 774ffdf975..6bce0e6541 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -90,7 +90,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='ioh3420'/> <flag name='x3130-upstream'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 8250eb9b3f..0c36af383d 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -73,7 +73,6 @@ <flag name='dea-key-wrap'/> <flag name='pci-serial'/> <flag name='aarch64-off'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='gpex-pcihost'/> <flag name='ioh3420'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index f16a506323..d03ca75b61 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -70,7 +70,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='ioh3420'/> <flag name='x3130-upstream'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 914df4de72..8a77d5445d 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -73,7 +73,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='gpex-pcihost'/> <flag name='ioh3420'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index b368406433..3e6753cddd 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -90,7 +90,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='ioh3420'/> <flag name='x3130-upstream'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index a383774205..fa7da1bda7 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -33,7 +33,6 @@ <flag name='drive-iotune-max'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='incoming-defer'/> <flag name='chardev-file-append'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index f6b028c3b5..503f2ba80a 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -90,7 +90,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='ioh3420'/> <flag name='x3130-upstream'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index fac861dbce..c613bfd642 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -72,7 +72,6 @@ <flag name='dea-key-wrap'/> <flag name='pci-serial'/> <flag name='aarch64-off'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='gpex-pcihost'/> <flag name='ioh3420'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index aa6501c3eb..6a2592ec06 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -69,7 +69,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='ioh3420'/> <flag name='x3130-upstream'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 52259b08b3..083a02f970 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -72,7 +72,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='gpex-pcihost'/> <flag name='ioh3420'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index e8fb5d69d7..f5f324e54f 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -43,7 +43,6 @@ <flag name='drive-iotune-max'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='virtio-net'/> <flag name='incoming-defer'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 2534ede341..e3bae78195 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -89,7 +89,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='gpex-pcihost'/> <flag name='ioh3420'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index e8e74917bf..68d48843f6 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -88,7 +88,6 @@ <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> - <flag name='vhost-user-multiqueue'/> <flag name='migration-event'/> <flag name='gpex-pcihost'/> <flag name='ioh3420'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 186dc63da9..9526300b7a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1620,10 +1620,8 @@ mymain(void) DO_TEST_PARSE_ERROR("vhost_queues-invalid", NONE); DO_TEST("net-vhostuser", QEMU_CAPS_CHARDEV_FD_PASS); DO_TEST_CAPS_LATEST("net-vhostuser"); - DO_TEST("net-vhostuser-multiq", - QEMU_CAPS_VHOSTUSER_MULTIQUEUE); - DO_TEST_FAILURE("net-vhostuser-fail", - QEMU_CAPS_VHOSTUSER_MULTIQUEUE); + DO_TEST("net-vhostuser-multiq", NONE); + DO_TEST_FAILURE("net-vhostuser-fail", NONE); DO_TEST("net-user", NONE); DO_TEST_CAPS_ARCH_VER_FULL("net-user", "x86_64", "4.0.0", ARG_FLAGS, FLAG_SLIRP_HELPER); DO_TEST("net-user-addr", NONE); -- 2.30.2