[PATCH 27/31] qemu: capabilities: Retire obsolete 'pseries' capabilities

Retire: QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE QEMU_CAPS_MACHINE_PSERIES_CAP_HTM QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC QEMU_CAPS_MACHINE_PSERIES_CAP_IBS Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 21 +++++++------------ src/qemu/qemu_capabilities.h | 14 ++++++------- .../qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 7 ------- .../qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 7 ------- .../qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 7 ------- .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 7 ------- .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 7 ------- .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 7 ------- 8 files changed, 14 insertions(+), 63 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 93915a9284..b023c7d178 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -497,10 +497,10 @@ VIR_ENUM_IMPL(virQEMUCaps, "mch", /* QEMU_CAPS_DEVICE_MCH */ "mch.extended-tseg-mbytes", /* QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES */ "sev-guest", /* QEMU_CAPS_SEV_GUEST */ - "machine.pseries.cap-hpt-max-page-size", /* QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE */ + "machine.pseries.cap-hpt-max-page-size", /* X_QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE */ /* 310 */ - "machine.pseries.cap-htm", /* QEMU_CAPS_MACHINE_PSERIES_CAP_HTM */ + "machine.pseries.cap-htm", /* X_QEMU_CAPS_MACHINE_PSERIES_CAP_HTM */ "usb-storage.werror", /* X_QEMU_CAPS_USB_STORAGE_WERROR */ "egl-headless", /* QEMU_CAPS_EGL_HEADLESS */ "vfio-pci.display", /* QEMU_CAPS_VFIO_PCI_DISPLAY */ @@ -514,7 +514,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "iothread.poll-max-ns", /* X_QEMU_CAPS_IOTHREAD_POLLING */ /* 320 */ - "machine.pseries.cap-nested-hv", /* QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV */ + "machine.pseries.cap-nested-hv", /* X_QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV */ "egl-headless.rendernode", /* QEMU_CAPS_EGL_HEADLESS_RENDERNODE */ "memory-backend-file.align", /* X_QEMU_CAPS_OBJECT_MEMORY_FILE_ALIGN */ "memory-backend-file.pmem", /* QEMU_CAPS_OBJECT_MEMORY_FILE_PMEM */ @@ -546,7 +546,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "query-cpu-model-baseline", /* QEMU_CAPS_QUERY_CPU_MODEL_BASELINE */ "query-cpu-model-comparison", /* QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON */ "ramfb", /* QEMU_CAPS_DEVICE_RAMFB */ - "machine.pseries.cap-ccf-assist", /* QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST */ + "machine.pseries.cap-ccf-assist", /* X_QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST */ /* 345 */ "arm-max-cpu", /* QEMU_CAPS_ARM_MAX_CPU */ @@ -574,11 +574,11 @@ VIR_ENUM_IMPL(virQEMUCaps, "virtio.packed", /* X_QEMU_CAPS_VIRTIO_PACKED_QUEUES */ "pcie-root-port.hotplug", /* QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG */ "aio.io_uring", /* QEMU_CAPS_AIO_IO_URING */ - "machine.pseries.cap-cfpc", /* QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC */ + "machine.pseries.cap-cfpc", /* X_QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC */ /* 365 */ - "machine.pseries.cap-sbbc", /* QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC */ - "machine.pseries.cap-ibs", /* QEMU_CAPS_MACHINE_PSERIES_CAP_IBS */ + "machine.pseries.cap-sbbc", /* X_QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC */ + "machine.pseries.cap-ibs", /* X_QEMU_CAPS_MACHINE_PSERIES_CAP_IBS */ "tcg", /* QEMU_CAPS_TCG */ "virtio-blk-pci.scsi.default.disabled", /* QEMU_CAPS_VIRTIO_BLK_SCSI_DEFAULT_DISABLED */ "pvscsi", /* QEMU_CAPS_SCSI_PVSCSI */ @@ -1715,13 +1715,6 @@ static virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { }; static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsPSeries[] = { - { "cap-hpt-max-page-size", QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE }, - { "cap-htm", QEMU_CAPS_MACHINE_PSERIES_CAP_HTM }, - { "cap-nested-hv", QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV }, - { "cap-ccf-assist", QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST }, - { "cap-cfpc", QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC }, - { "cap-sbbc", QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC }, - { "cap-ibs", QEMU_CAPS_MACHINE_PSERIES_CAP_IBS }, }; static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsVirt[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ca31e26f0d..3b55aed07a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -476,10 +476,10 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_DEVICE_MCH, /* Northbridge in q35 machine types */ QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES, /* -global mch.extended-tseg-mbytes */ QEMU_CAPS_SEV_GUEST, /* -object sev-guest,... */ - QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE, /* -machine pseries.cap-hpt-max-page-size */ + X_QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE, /* -machine pseries.cap-hpt-max-page-size */ /* 310 */ - QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, /* -machine pseries.cap-htm */ + X_QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, /* -machine pseries.cap-htm */ X_QEMU_CAPS_USB_STORAGE_WERROR, /* -device usb-storage,werror=..,rerror=.. */ QEMU_CAPS_EGL_HEADLESS, /* -display egl-headless */ QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */ @@ -493,7 +493,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_IOTHREAD_POLLING, /* -object iothread.poll-max-ns */ /* 320 */ - QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, /* -machine pseries.cap-nested-hv */ + X_QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, /* -machine pseries.cap-nested-hv */ QEMU_CAPS_EGL_HEADLESS_RENDERNODE, /* -display egl-headless,rendernode= */ X_QEMU_CAPS_OBJECT_MEMORY_FILE_ALIGN, /* -object memory-backend-file,align= */ QEMU_CAPS_OBJECT_MEMORY_FILE_PMEM, /* -object memory-backend-file,pmem= */ @@ -525,7 +525,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_QUERY_CPU_MODEL_BASELINE, /* qmp query-cpu-model-baseline */ QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON, /* qmp query-cpu-model-comparison */ QEMU_CAPS_DEVICE_RAMFB, /* -device ramfb */ - QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST, /* -machine pseries.cap-ccf-assist */ + X_QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST, /* -machine pseries.cap-ccf-assist */ /* 345 */ QEMU_CAPS_ARM_MAX_CPU, /* max-arm-cpu type exists */ @@ -553,11 +553,11 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_VIRTIO_PACKED_QUEUES, /* virtio.packed */ QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG, /* pcie-root-port.hotplug */ QEMU_CAPS_AIO_IO_URING, /* -blockdev {...,"aio":"io_uring",...} */ - QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC, /* -machine pseries.cap-cfpc */ + X_QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC, /* -machine pseries.cap-cfpc */ /* 365 */ - QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC, /* -machine pseries.cap-sbbc */ - QEMU_CAPS_MACHINE_PSERIES_CAP_IBS, /* -machine pseries.cap-ibs */ + X_QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC, /* -machine pseries.cap-sbbc */ + X_QEMU_CAPS_MACHINE_PSERIES_CAP_IBS, /* -machine pseries.cap-ibs */ QEMU_CAPS_TCG, /* QEMU does support TCG */ QEMU_CAPS_VIRTIO_BLK_SCSI_DEFAULT_DISABLED, /* virtio-blk-pci.scsi disabled by default */ QEMU_CAPS_SCSI_PVSCSI, /* -device pvscsi */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml index 1cc145cf58..2064f07c9c 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml @@ -81,13 +81,10 @@ <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vhost-vsock'/> - <flag name='machine.pseries.cap-hpt-max-page-size'/> - <flag name='machine.pseries.cap-htm'/> <flag name='egl-headless'/> <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> - <flag name='machine.pseries.cap-nested-hv'/> <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> <flag name='virtio-pci-non-transitional'/> @@ -96,14 +93,10 @@ <flag name='migration-file-drop-cache'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='machine.pseries.cap-ccf-assist'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='i8042'/> <flag name='rng-builtin'/> - <flag name='machine.pseries.cap-cfpc'/> - <flag name='machine.pseries.cap-sbbc'/> - <flag name='machine.pseries.cap-ibs'/> <flag name='tcg'/> <flag name='pvscsi'/> <flag name='spapr-tpm-proxy'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml index 3b49aee40a..16333ba499 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml @@ -84,13 +84,10 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> - <flag name='machine.pseries.cap-hpt-max-page-size'/> - <flag name='machine.pseries.cap-htm'/> <flag name='egl-headless'/> <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> - <flag name='machine.pseries.cap-nested-hv'/> <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> @@ -101,7 +98,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='machine.pseries.cap-ccf-assist'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='i8042'/> @@ -112,9 +108,6 @@ <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> - <flag name='machine.pseries.cap-cfpc'/> - <flag name='machine.pseries.cap-sbbc'/> - <flag name='machine.pseries.cap-ibs'/> <flag name='tcg'/> <flag name='virtio-blk-pci.scsi.default.disabled'/> <flag name='pvscsi'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml index d02441420d..9db85dafef 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml @@ -82,13 +82,10 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> - <flag name='machine.pseries.cap-hpt-max-page-size'/> - <flag name='machine.pseries.cap-htm'/> <flag name='egl-headless'/> <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> - <flag name='machine.pseries.cap-nested-hv'/> <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> @@ -99,7 +96,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='machine.pseries.cap-ccf-assist'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='i8042'/> @@ -110,9 +106,6 @@ <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> - <flag name='machine.pseries.cap-cfpc'/> - <flag name='machine.pseries.cap-sbbc'/> - <flag name='machine.pseries.cap-ibs'/> <flag name='tcg'/> <flag name='virtio-blk-pci.scsi.default.disabled'/> <flag name='pvscsi'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml index 97ebca47eb..e6b0bc03f4 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -82,12 +82,9 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> - <flag name='machine.pseries.cap-hpt-max-page-size'/> - <flag name='machine.pseries.cap-htm'/> <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> - <flag name='machine.pseries.cap-nested-hv'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> <flag name='nbd-bitmap'/> @@ -97,7 +94,6 @@ <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> <flag name='incremental-backup'/> - <flag name='machine.pseries.cap-ccf-assist'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='i8042'/> @@ -109,9 +105,6 @@ <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> - <flag name='machine.pseries.cap-cfpc'/> - <flag name='machine.pseries.cap-sbbc'/> - <flag name='machine.pseries.cap-ibs'/> <flag name='tcg'/> <flag name='virtio-blk-pci.scsi.default.disabled'/> <flag name='pvscsi'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml index a00ed4ef68..40130f180f 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -88,13 +88,10 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> - <flag name='machine.pseries.cap-hpt-max-page-size'/> - <flag name='machine.pseries.cap-htm'/> <flag name='egl-headless'/> <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> - <flag name='machine.pseries.cap-nested-hv'/> <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> @@ -106,7 +103,6 @@ <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> <flag name='incremental-backup'/> - <flag name='machine.pseries.cap-ccf-assist'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='i8042'/> @@ -119,9 +115,6 @@ <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> - <flag name='machine.pseries.cap-cfpc'/> - <flag name='machine.pseries.cap-sbbc'/> - <flag name='machine.pseries.cap-ibs'/> <flag name='tcg'/> <flag name='virtio-blk-pci.scsi.default.disabled'/> <flag name='pvscsi'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml index ccae1b1d2b..6bc39b85f7 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -87,12 +87,9 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='tpm-emulator'/> - <flag name='machine.pseries.cap-hpt-max-page-size'/> - <flag name='machine.pseries.cap-htm'/> <flag name='vfio-pci.display'/> <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> - <flag name='machine.pseries.cap-nested-hv'/> <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> @@ -103,7 +100,6 @@ <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> <flag name='incremental-backup'/> - <flag name='machine.pseries.cap-ccf-assist'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='i8042'/> @@ -116,9 +112,6 @@ <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> - <flag name='machine.pseries.cap-cfpc'/> - <flag name='machine.pseries.cap-sbbc'/> - <flag name='machine.pseries.cap-ibs'/> <flag name='tcg'/> <flag name='virtio-blk-pci.scsi.default.disabled'/> <flag name='pvscsi'/> -- 2.39.2