[PATCH 32/38] qemu: capabilities: Fix detection of 'vmport'

'query-commandline-options' never returned 'vmport' but we can detect it in the list of supported object types. This removes it from all non-x86 originating test data as it's platform specific. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 3 +-- tests/qemucapabilitiesdata/caps_2.11.0.s390x.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_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.1.0.ppc64.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.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_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.1.0.sparc.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 - 26 files changed, 1 insertion(+), 27 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c2b7764eb8..5a745c15c8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1330,6 +1330,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "tcg-accel", QEMU_CAPS_TCG }, { "pvscsi", QEMU_CAPS_SCSI_PVSCSI }, { "spapr-tpm-proxy", QEMU_CAPS_DEVICE_SPAPR_TPM_PROXY }, + { "vmport", QEMU_CAPS_MACHINE_VMPORT_OPT }, /* * We don't probe 'esp' directly, because it is often reported * as present for all QEMU binaries, due to it being enabled @@ -3214,7 +3215,6 @@ struct virQEMUCapsCommandLineProps { static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE }, - { "machine", "vmport", QEMU_CAPS_MACHINE_VMPORT_OPT }, { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, { "drive", "detect-zeroes", QEMU_CAPS_DRIVE_DETECT_ZEROES }, { "boot-opts", "strict", QEMU_CAPS_BOOT_STRICT }, @@ -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_MACHINE_VMPORT_OPT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL_GL); diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 50414bb386..93c4a11e4b 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -41,7 +41,6 @@ <flag name='iothread'/> <flag name='migrate-rdma'/> <flag name='drive-iotune-max'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='vhost-user-multiqueue'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index f5a3916038..1c66bfa1e9 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -64,7 +64,6 @@ <flag name='ivshmem'/> <flag name='drive-iotune-max'/> <flag name='VGA.vgamem_mb'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index dbc7fcf988..f9e6a5f89e 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -64,7 +64,6 @@ <flag name='drive-iotune-max'/> <flag name='VGA.vgamem_mb'/> <flag name='pc-dimm'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index da0c1222b0..ef00d22c80 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -41,7 +41,6 @@ <flag name='iothread'/> <flag name='migrate-rdma'/> <flag name='drive-iotune-max'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='vhost-user-multiqueue'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 77bac22242..16132ce3bc 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -63,7 +63,6 @@ <flag name='drive-iotune-max'/> <flag name='VGA.vgamem_mb'/> <flag name='pc-dimm'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 35236caddf..f7a9cd6db2 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -31,7 +31,6 @@ <flag name='iothread'/> <flag name='migrate-rdma'/> <flag name='drive-iotune-max'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='vhost-user-multiqueue'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index 9aad89f4f6..2079932c09 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -31,7 +31,6 @@ <flag name='iothread'/> <flag name='migrate-rdma'/> <flag name='drive-iotune-max'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='vhost-user-multiqueue'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index dd2803141f..330fbf20a1 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -42,7 +42,6 @@ <flag name='iothread'/> <flag name='migrate-rdma'/> <flag name='drive-iotune-max'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='vhost-user-multiqueue'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index a963c2cf1c..324e50d032 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -64,7 +64,6 @@ <flag name='drive-iotune-max'/> <flag name='VGA.vgamem_mb'/> <flag name='pc-dimm'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml index 2ca509eae7..692ed9a8b5 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -66,7 +66,6 @@ <flag name='drive-iotune-max'/> <flag name='VGA.vgamem_mb'/> <flag name='vmware-svga.vgamem_mb'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml index 2f68794682..56ef18f9e2 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -66,7 +66,6 @@ <flag name='VGA.vgamem_mb'/> <flag name='vmware-svga.vgamem_mb'/> <flag name='pc-dimm'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index b2f2df4d1d..aaf5c847e5 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -70,7 +70,6 @@ <flag name='drive-iotune-max'/> <flag name='VGA.vgamem_mb'/> <flag name='vmware-svga.vgamem_mb'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 18effd78d6..6b23827eac 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -70,7 +70,6 @@ <flag name='drive-iotune-max'/> <flag name='VGA.vgamem_mb'/> <flag name='vmware-svga.vgamem_mb'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml index 04ee80166f..1a3bcc381c 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -42,7 +42,6 @@ <flag name='iothread'/> <flag name='migrate-rdma'/> <flag name='drive-iotune-max'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='vhost-user-multiqueue'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 54c704339b..fcea29ad95 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -67,7 +67,6 @@ <flag name='VGA.vgamem_mb'/> <flag name='vmware-svga.vgamem_mb'/> <flag name='pc-dimm'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index fa58c603b8..b7b855bdb7 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -66,7 +66,6 @@ <flag name='VGA.vgamem_mb'/> <flag name='vmware-svga.vgamem_mb'/> <flag name='pc-dimm'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 948a0b3fd9..ab25e68b27 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -42,7 +42,6 @@ <flag name='iothread'/> <flag name='migrate-rdma'/> <flag name='drive-iotune-max'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='vhost-user-multiqueue'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 08fbd75e1a..8250eb9b3f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -69,7 +69,6 @@ <flag name='VGA.vgamem_mb'/> <flag name='vmware-svga.vgamem_mb'/> <flag name='pc-dimm'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 335c0378b7..f16a506323 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -67,7 +67,6 @@ <flag name='VGA.vgamem_mb'/> <flag name='vmware-svga.vgamem_mb'/> <flag name='pc-dimm'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 2a6538545d..914df4de72 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -70,7 +70,6 @@ <flag name='drive-iotune-max'/> <flag name='VGA.vgamem_mb'/> <flag name='vmware-svga.vgamem_mb'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 468f7e3397..a383774205 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -31,7 +31,6 @@ <flag name='iothread'/> <flag name='migrate-rdma'/> <flag name='drive-iotune-max'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='vhost-user-multiqueue'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 3ec786cb88..fac861dbce 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -68,7 +68,6 @@ <flag name='VGA.vgamem_mb'/> <flag name='vmware-svga.vgamem_mb'/> <flag name='pc-dimm'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 03f4eb7ae7..aa6501c3eb 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -66,7 +66,6 @@ <flag name='VGA.vgamem_mb'/> <flag name='vmware-svga.vgamem_mb'/> <flag name='pc-dimm'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 45e34d9c31..52259b08b3 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -69,7 +69,6 @@ <flag name='drive-iotune-max'/> <flag name='VGA.vgamem_mb'/> <flag name='vmware-svga.vgamem_mb'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='pci-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index ad33b50796..e8fb5d69d7 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -41,7 +41,6 @@ <flag name='iothread'/> <flag name='migrate-rdma'/> <flag name='drive-iotune-max'/> - <flag name='machine-vmport-opt'/> <flag name='aes-key-wrap'/> <flag name='dea-key-wrap'/> <flag name='vhost-user-multiqueue'/> -- 2.30.2