External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 19:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Retire QEMU_CAPS_LOADPARM

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-03-06 21:25:15 +01:00
parent e30387b340
commit 8f2fb353e4
5 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_capabilities.c
View File

@ -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:

2
src/qemu/qemu_capabilities.h
View File

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

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

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

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

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

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

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