[PATCH 02/51] qemu: capabilities: Retire QEMU_CAPS_ICH9_DISABLE_S* and QEMU_CAPS_ICH9_DISABLE_S* capabilities

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 12 ++++-------- src/qemu/qemu_capabilities.h | 8 ++++---- tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 2 -- tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 4 ---- tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 4 ---- 19 files changed, 8 insertions(+), 72 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ea4e248349..b52e25a072 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -208,8 +208,8 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 100 */ "virtio-scsi-pci", /* QEMU_CAPS_VIRTIO_SCSI */ "blockio", /* X_QEMU_CAPS_BLOCKIO */ - "disable-s3", /* QEMU_CAPS_PIIX_DISABLE_S3 */ - "disable-s4", /* QEMU_CAPS_PIIX_DISABLE_S4 */ + "disable-s3", /* X_QEMU_CAPS_PIIX_DISABLE_S3 */ + "disable-s4", /* X_QEMU_CAPS_PIIX_DISABLE_S4 */ "usb-redir.filter", /* QEMU_CAPS_USB_REDIR_FILTER */ /* 105 */ @@ -354,8 +354,8 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 205 */ "chardev-file-append", /* X_QEMU_CAPS_CHARDEV_FILE_APPEND */ - "ich9-disable-s3", /* QEMU_CAPS_ICH9_DISABLE_S3 */ - "ich9-disable-s4", /* QEMU_CAPS_ICH9_DISABLE_S4 */ + "ich9-disable-s3", /* X_QEMU_CAPS_ICH9_DISABLE_S3 */ + "ich9-disable-s4", /* X_QEMU_CAPS_ICH9_DISABLE_S4 */ "vserport-change-event", /* X_QEMU_CAPS_VSERPORT_CHANGE */ "virtio-balloon-pci.deflate-on-oom", /* QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE */ @@ -1457,8 +1457,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIDEDrive[] = { }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPiix4PM[] = { - { "disable_s3", QEMU_CAPS_PIIX_DISABLE_S3, NULL }, - { "disable_s4", QEMU_CAPS_PIIX_DISABLE_S4, NULL }, { "acpi-root-pci-hotplug", QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG, NULL }, }; @@ -1493,8 +1491,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioGpu[] = { }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsICH9[] = { - { "disable_s3", QEMU_CAPS_ICH9_DISABLE_S3, NULL }, - { "disable_s4", QEMU_CAPS_ICH9_DISABLE_S4, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIntelIOMMU[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ba289ba6b9..642a4762b3 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -186,8 +186,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 100 */ QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */ X_QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */ - QEMU_CAPS_PIIX_DISABLE_S3, /* -M pc S3 BIOS Advertisement on/off */ - QEMU_CAPS_PIIX_DISABLE_S4, /* -M pc S4 BIOS Advertisement on/off */ + X_QEMU_CAPS_PIIX_DISABLE_S3, /* -M pc S3 BIOS Advertisement on/off */ + X_QEMU_CAPS_PIIX_DISABLE_S4, /* -M pc S4 BIOS Advertisement on/off */ QEMU_CAPS_USB_REDIR_FILTER, /* usb-redir.filter */ /* 105 */ @@ -332,8 +332,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 205 */ X_QEMU_CAPS_CHARDEV_FILE_APPEND, /* -chardev file,append=on|off */ - QEMU_CAPS_ICH9_DISABLE_S3, /* -M q35 S3 BIOS Advertisement on/off */ - QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */ + X_QEMU_CAPS_ICH9_DISABLE_S3, /* -M q35 S3 BIOS Advertisement on/off */ + X_QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */ X_QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */ QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,ccw}. * deflate-on-oom */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml index bf920a74c4..3c197af464 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml @@ -25,8 +25,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -72,8 +70,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml index 8fa4148232..dc107952ca 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml @@ -25,8 +25,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -72,8 +70,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml index c0f3444d85..ddd3b560ab 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml @@ -25,8 +25,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -72,8 +70,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml index 6bd531a825..7162ca6a18 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml @@ -25,8 +25,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -72,8 +70,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml index 4223eb1a2e..77890694ad 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -71,8 +69,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml index cacfd6969f..563c337b23 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -70,8 +68,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml index 914cda2048..b18d0509c2 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -20,8 +20,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='vnc'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml index 4792691285..a33911ff3c 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -70,8 +68,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml index 748b897f70..6f29b29632 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml index 8d026d540d..ce16662d6b 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -70,8 +68,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml index 310b8f9d75..67d9b23e79 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -23,8 +23,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml index 07e8c57f27..56422fbdf8 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -70,8 +68,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml index b8d4d4888c..e5df1832b7 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index 928270d287..69e35c7133 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -23,8 +23,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -69,8 +67,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index a889c1b034..b2fd5794cc 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -70,8 +68,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index 6d105e78a9..3613dfd4cc 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -70,8 +68,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index adcf594138..965ba37c7f 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -24,8 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> <flag name='usb-redir.filter'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> @@ -70,8 +68,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='ich9-disable-s3'/> - <flag name='ich9-disable-s4'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> -- 2.41.0