External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Retire QEMU_CAPS_VHOSTUSER_MULTIQUEUE

Browse Source 
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@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2021-04-19 13:04:42 +02:00
parent ab5afec1b3
commit 4819a6c06f
40 changed files with 4 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_capabilities.c
View File

@ -5021,7 +5021,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);

2
src/qemu/qemu_capabilities.h
View File

@ -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 */

11
src/qemu/qemu_domain.c
View File

@ -4567,7 +4567,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
@ -4603,15 +4603,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;
}
}
/*

1
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
View File

@ -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'/>

6
tests/qemuxml2argvtest.c
View File

@ -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);