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

qemu: capabilities: Fix detection of 'vmport'

Browse Source 
'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@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2021-04-19 12:56:12 +02:00
parent 8628689eda
commit ab5afec1b3
26 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_capabilities.c
View File

@ -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 },
@ -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_MACHINE_VMPORT_OPT);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL_GL);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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