[PATCH 14/15] qemu: capabilities: Retire QEMU_CAPS_LOADPARM
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 5 +----
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
5 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 50c303d98f..76fb739fbc 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -431,7 +431,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 260 */
"virtio.ats", /* X_QEMU_CAPS_VIRTIO_PCI_ATS */
- "loadparm", /* QEMU_CAPS_LOADPARM */
+ "loadparm", /* X_QEMU_CAPS_LOADPARM */
"spapr-pci-host-bridge", /*
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE */
"spapr-pci-host-bridge.numa_node", /*
QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE */
"vnc-multi-servers", /* X_QEMU_CAPS_VNC_MULTI_SERVERS */
@@ -5475,9 +5475,6 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
switch (qemuCaps->arch) {
case VIR_ARCH_S390:
case VIR_ARCH_S390X:
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_LOADPARM);
- break;
-
case VIR_ARCH_AARCH64:
case VIR_ARCH_I686:
case VIR_ARCH_X86_64:
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index fa068dcbff..dfa0b806de 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -410,7 +410,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 260 */
X_QEMU_CAPS_VIRTIO_PCI_ATS, /* virtio-*-pci.ats */
- QEMU_CAPS_LOADPARM, /* -machine loadparm */
+ X_QEMU_CAPS_LOADPARM, /* -machine loadparm */
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, /* -device spapr-pci-host-bridge */
QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE, /* spapr-pci-host-bridge.numa_node= */
X_QEMU_CAPS_VNC_MULTI_SERVERS, /* -vnc vnc=unix:/path */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index c3fd0e4ce3..08d0993ba3 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -35,7 +35,6 @@
<flag name='vhost-scsi'/>
<flag name='query-cpu-model-expansion'/>
<flag name='query-cpu-definitions'/>
- <flag name='loadparm'/>
<flag name='chardev-reconnect'/>
<flag name='vxhs'/>
<flag name='sclplmconsole'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 0a74ec9f2c..3ec0bd4c32 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -34,7 +34,6 @@
<flag name='vhost-scsi'/>
<flag name='query-cpu-model-expansion'/>
<flag name='query-cpu-definitions'/>
- <flag name='loadparm'/>
<flag name='chardev-reconnect'/>
<flag name='sclplmconsole'/>
<flag name='virtio-gpu-ccw'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index ee9516734a..89420c1e9b 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -34,7 +34,6 @@
<flag name='vhost-scsi'/>
<flag name='query-cpu-model-expansion'/>
<flag name='query-cpu-definitions'/>
- <flag name='loadparm'/>
<flag name='chardev-reconnect'/>
<flag name='sclplmconsole'/>
<flag name='virtio-gpu-ccw'/>
--
2.39.2