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: Assume QEMU_CAPS_LOADPARM for s390 only

Browse Source 
Added to 'query-command-line-options' in qemu commit 5559716c98
("util/qemu-config: Add loadparm to qemu machine_opts") released in
qemu-v2.10.0 but makes sense for s390 only. Treat it the same as the
keywrap capabilities in previous commit.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-07-27 10:41:50 +02:00
parent da20199762
commit 04e5b3134f
33 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_capabilities.c
View File

@ -3210,7 +3210,6 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
{ "fsdev", "fmode", QEMU_CAPS_FSDEV_CREATEMODE }, /* Could have also checked fsdev->dmode */
{ "fw_cfg", "file", QEMU_CAPS_FW_CFG },
{ "machine", "kernel_irqchip", QEMU_CAPS_MACHINE_KERNEL_IRQCHIP },
{ "machine", "loadparm", QEMU_CAPS_LOADPARM },
{ "numa", NULL, QEMU_CAPS_NUMA }, /* not needed after qemuCaps->version < 3000000 */
{ "overcommit", NULL, QEMU_CAPS_OVERCOMMIT },
{ "sandbox", "enable", QEMU_CAPS_SECCOMP_SANDBOX },
@ -5004,6 +5003,7 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
case VIR_ARCH_S390X:
virQEMUCapsSet(qemuCaps, QEMU_CAPS_AES_KEY_WRAP);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEA_KEY_WRAP);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_LOADPARM);
break;
case VIR_ARCH_ALPHA:

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

@ -141,7 +141,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -102,7 +102,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -96,7 +96,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='spapr-pci-host-bridge'/>
<flag name='spapr-pci-host-bridge.numa_node'/>
<flag name='vnc-multi-servers'/>

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

@ -138,7 +138,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -95,7 +95,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='spapr-pci-host-bridge'/>
<flag name='spapr-pci-host-bridge.numa_node'/>
<flag name='vnc-multi-servers'/>

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

@ -48,7 +48,6 @@
<flag name='query-named-block-nodes'/>
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='chardev-reconnect'/>
<flag name='virtio-gpu.max_outputs'/>

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

@ -48,7 +48,6 @@
<flag name='query-named-block-nodes'/>
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='chardev-reconnect'/>
<flag name='virtio-gpu.max_outputs'/>

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

@ -140,7 +140,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -96,7 +96,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='spapr-pci-host-bridge'/>
<flag name='spapr-pci-host-bridge.numa_node'/>
<flag name='vnc-multi-servers'/>

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

@ -140,7 +140,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -104,7 +104,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -102,7 +102,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='spapr-pci-host-bridge'/>
<flag name='spapr-pci-host-bridge.numa_node'/>
<flag name='vnc-multi-servers'/>

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

@ -109,7 +109,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -109,7 +109,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -139,7 +139,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -139,7 +139,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -106,7 +106,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -102,7 +102,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='spapr-pci-host-bridge'/>
<flag name='spapr-pci-host-bridge.numa_node'/>
<flag name='vnc-multi-servers'/>

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

@ -140,7 +140,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -108,7 +108,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -104,7 +104,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='spapr-pci-host-bridge'/>
<flag name='spapr-pci-host-bridge.numa_node'/>
<flag name='vnc-multi-servers'/>

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

@ -109,7 +109,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -140,7 +140,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -42,7 +42,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='kernel-irqchip'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='chardev-reconnect'/>
<flag name='disk-share-rw'/>

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

@ -140,7 +140,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -108,7 +108,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -103,7 +103,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='spapr-pci-host-bridge'/>
<flag name='spapr-pci-host-bridge.numa_node'/>
<flag name='vnc-multi-servers'/>

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

@ -108,7 +108,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -140,7 +140,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -109,7 +109,6 @@
<flag name='kernel-irqchip'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -139,7 +139,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -138,7 +138,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>