]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: capabilities: Assume QEMU_CAPS_LOADPARM for s390 only
authorPeter Krempa <pkrempa@redhat.com>
Tue, 27 Jul 2021 08:41:50 +0000 (10:41 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 21 Sep 2021 10:26:08 +0000 (12:26 +0200)
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>
33 files changed:
src/qemu/qemu_capabilities.c
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml

index c9d56c5ad53fa01956d9c5a6105163a93ea81d03..ab471cfa4380597452e10f789cfd79b1b5de53dc 100644 (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:
index 62326b50d7e5342d6a0ea016a5bc622823cdba2c..11e4fbf06c761eda2df5adbc7d4eb2019b8f7276 100644 (file)
   <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'/>
index 32059002f44e5fde4f9929c32b507c9ddb57fae5..8dd48c7baabf5021d5c77b023aeb8aecc2fb9053 100644 (file)
   <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'/>
index 24b2f1779e01d828820f403a932c73b799c2ff8c..bc0c797b78e440aed57543ce06401a84ece25c80 100644 (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'/>
index f410a1b57a7cbda241868efda4c7d4d33e54e65d..08bb56f00dc1daf04e85f94354b9271a3e3a6524 100644 (file)
   <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'/>
index 51496f4f0b05bc7f86703ecbe378fdd3b9fb5d7b..14eac43dc0916ae38f9cddc007811522c053d425 100644 (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'/>
index 6c976825d81d1463a12568b93574653d8c1eb38c..e2f2ebadc0dd11d854f6ccb751d264f426cb0a59 100644 (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'/>
index 1eebed01002ea0f582995998e493c65d62c86e8c..05dc09b3c5ceedbc0cc5658fff63301bf4b60cc8 100644 (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'/>
index adfc101766ac9338e49dfa4580700d7cecb914c7..2e92d1437a674763c5a04347816ca482f6e05804 100644 (file)
   <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'/>
index 2c8a9620d659ab17e8a78d58cf2ba98e6b54dc08..f5d18032ad1ed9c35d13e8440c7913c6f7f6920d 100644 (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'/>
index ca796c0b18638bbcd3f41df6f051e44051d8d435..e07b8961762695e3d767921b85feedb29149c8b0 100644 (file)
   <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'/>
index d16b6f12e2a41333bdff3a10ab09ad76aaf8bd8b..024d73ba42c490af54c02bdad90ea3b50d4d188c 100644 (file)
   <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'/>
index 263781cf0f712d685fc4dd940d78d24b6416270a..d63dde0c4f450ed0e4cc26947c12e3d574e52155 100644 (file)
   <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'/>
index eb661dcc43cb68baf9c1c70c5d468769a816277a..8b9bbd9cf103a388f0964388e89e29ed00933272 100644 (file)
   <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'/>
index e47593c1da711af27474a2fc3c0921473e9ee928..3c9deb83dd7f45b4174249c94d7bd62a7b8065d1 100644 (file)
   <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'/>
index a5936fb94e7fdcc5bb7add741f80a4c01aaa18e3..b17651c41557ca95cc9ec01ecdb573b602e0fb15 100644 (file)
   <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'/>
index 758318d811c8366b9ac57d12c3d39cc9f66e24e1..574789d816af2c06566cd33d4a84f97734ab3c52 100644 (file)
   <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'/>
index 10bf3a86c2ff78161d9ba485853c05daf10929d9..44ac745c98b68338af07b5d9b977e1e9afa84e60 100644 (file)
   <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'/>
index e109e6c713cb844afbe58402076cde6c08b615f5..37cb6512430d17697bf321fd646f1591c80a134b 100644 (file)
   <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'/>
index 3dec056865151a8e22fa2b90d112ab1c7d26ca5f..ee6ab2a8423e6d423ad4456b6a38ac5ff76a05ce 100644 (file)
   <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'/>
index 7c665a911210804c38ea325b56691256ebde621a..7441af727c60f2d47ec3d18d5b16a873ce324c6b 100644 (file)
   <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'/>
index 6d7326d901d2d052fcbeb41d47f76cb52798573e..5fbb3d83fc4bb25771c1f8c8a3caa77508068ea7 100644 (file)
   <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'/>
index 497b9ee2385a5bf0f5dddbec5cf965d546126102..734aef1bc5522b69380d36350316d1087afcf689 100644 (file)
   <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'/>
index 3346831157805fcace17a8751f7bb4e2841d2c77..e4d655c051717441d1dfa4cc64c0feaf527b9f01 100644 (file)
   <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'/>
index eb60861eaf3a656bb1c87f658bf821848e15f263..afb0dfc6275af8ecf00a8f71ce20ed57a74fba05 100644 (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'/>
index 050bcefc8182ece822b8a7f1962de854133f01d1..5a16058668117aba72fdfcbe313a7a4e4b3fc652 100644 (file)
   <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'/>
index 084499a5157417782c6281b369cd28bb3a045be2..d6308b3fe829da6cf768753276186e0ed73f280b 100644 (file)
   <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'/>
index dc9b6c84826afbdc6566d3f30d7d5fbce85f3df3..305c5c82f13692ea0ab4882242a6be7fbb2019d4 100644 (file)
   <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'/>
index eb6212a7ee1bcd7254fc112cc1106c7a168b0af9..53496ef13ad3c8925b81dd5160d87eed91bde3f9 100644 (file)
   <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'/>
index b7c175285b53364f6fa3b7c9c9c5c44cfbfc9b9f..d466e56e3d28202968be7938f94d7828ffb6e50f 100644 (file)
   <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'/>
index 548218368cd8445aa2fc422c2f8dc4410b4660bd..d73f8867b2a62d8387b4f6d6c00c90d2462ccb20 100644 (file)
   <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'/>
index 9da8a17888025acd83de75bf0af737c46f1c5298..a05e920e8edcbfc805cd82119e122ce7aabdd4b4 100644 (file)
   <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'/>
index 9a2f2a34b6fe27a1b382946bab3a1ec192615f9d..c3a4448c94fc846b8756e01ac376f9400215fa17 100644 (file)
   <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'/>