External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Retire QEMU_CAPS_ICH9_DISABLE_S* and QEMU_CAPS_ICH9_DISABLE_S* capabilities

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-09-01 17:00:35 +02:00
parent c225398015
commit b816b41a65
19 changed files with 8 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_capabilities.c
View File

@ -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[] = {

8
src/qemu/qemu_capabilities.h
View File

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

4
tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
View File

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

4
tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
View File

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

4
tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
View File

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

4
tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
View File

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

4
tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
View File

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

4
tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
View File

@ -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
tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
View File

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

4
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
View File

@ -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
tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
View File

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

4
tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
View File

@ -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
tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
View File

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

4
tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
View File

@ -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
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
View File

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

4
tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
View File

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

4
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
View File

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

4
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
View File

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

4
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
View File

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