qemu: capabilities: Retire QEMU_CAPS_NO_ACPI

The capability is based on a platform check rather than what given qemu
supports.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c014c3d501d57c3cda168d019e848ea45477dbe8..fe0f2f1c4d24fb3bd7ec18b07277c5a62e5ee31e 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -172,7 +172,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
 
               /* 75 */
               "ich9-ahci", /* QEMU_CAPS_ICH9_AHCI */
-              "no-acpi", /* QEMU_CAPS_NO_ACPI */
+              "no-acpi", /* X_QEMU_CAPS_NO_ACPI */
               "fsdev-readonly", /* X_QEMU_CAPS_FSDEV_READONLY */
               "virtio-blk-pci.scsi", /* QEMU_CAPS_VIRTIO_BLK_SCSI */
               "blk-sg-io", /* X_QEMU_CAPS_VIRTIO_BLK_SG_IO */
@@ -5475,17 +5475,11 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
     switch (qemuCaps->arch) {
     case VIR_ARCH_I686:
     case VIR_ARCH_X86_64:
-        /* ACPI only works on x86 and aarch64 */
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI);
-
         /* HPET is x86 specific */
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET);
         break;
 
     case VIR_ARCH_AARCH64:
-        /* ACPI only works on x86 and aarch64 */
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI);
-
         /* gic is arm specific */
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACH_VIRT_GIC_VERSION);
         break;

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 04c7bfc193bd4934707b28bc07f281dbf33effa2..0110174fea10380e67613f37fdcf777028ce8d31 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -150,7 +150,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
 
     /* 75 */
     QEMU_CAPS_ICH9_AHCI, /* -device ich9-ahci */
-    QEMU_CAPS_NO_ACPI, /* -no-acpi */
+    X_QEMU_CAPS_NO_ACPI, /* -no-acpi */
     X_QEMU_CAPS_FSDEV_READONLY, /* -fsdev readonly supported */
     QEMU_CAPS_VIRTIO_BLK_SCSI, /* virtio-blk-pci.scsi */
     X_QEMU_CAPS_VIRTIO_BLK_SG_IO, /* SG_IO commands */

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 3452b275a6a7e56d1544e79716232ae8f646ace2..575e4fb98b1cb200011acdc8626f2215c7a8f226 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -14,7 +14,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 5d36e7e49ecc88006174d4edaf4532be65475045..6657f7d3930d0fd1d33e4e345c3f5d56f6cd3434 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -19,7 +19,6 @@
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index d2efacea98c112d07bbcf257c105b05b92f52b6c..f0dd035263dcd8afd9a6104efb6ad88be0c189c4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -14,7 +14,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index dd79dc309e3bbe9d65f1fa3c6e256f763d8294c2..8c145d19269cac901b1daa9b2dbf4e06bf96ece2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -19,7 +19,6 @@
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 6e218b0c48d84a3ea486ea1f44f68704399ddd73..d8a49f066451cc5f5da8eb6bb0f13be0a7aa7810 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -19,7 +19,6 @@
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index d45dac7aec1c3eda45eda517661aa8d38ecfaf39..783bf39f42b98f0f5c31657b7de8489d6b227ca3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -14,7 +14,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index f3c77ac1bdbb510446b97f7c8d70eb32f076a1ec..3c0dde99481020f23af3857130287c7b6426540b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -19,7 +19,6 @@
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index c17da78d6da3025b05f391eb31a9f3484f4a8f52..2bd64c9546405abafbfeef153a7bafb6cc0f3127 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -13,7 +13,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 067f6632a654e0edd85cab4fbaca1ebd2720003b..f5977d3e7e1026e12be84db345fcf696213b4c2d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -18,7 +18,6 @@
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index be0f713798b7432eaa42d2b0bd734f860f8907ab..d10b4a6b1e7264b4dcbdb8ba808388380df22306 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -18,7 +18,6 @@
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 32aa56c4e94698e96988792eec906b33fdf116fc..6d3fbac8ab039a631f9f44b809eea855b17c64c0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -17,7 +17,6 @@
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 9b2242d7c26431dd12d2604033034f7525d2da19..aa5361d4dd4d8d1b54c8694e79c63e01a29e47dc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -18,7 +18,6 @@
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 37157189a2e39cd7f171943e2a6ead4e2cff7cf8..05aa663b7bcef082f35b7e72d9781d267d686b1d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -17,7 +17,6 @@
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 3439050911879ddb39b8d31b0ece6ece78c3c3cb..17a63d09e643c41406afc075f174174c36a5f99f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -18,7 +18,6 @@
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index d9028b1c374c5b9af05c2553ca01054a7b75b3b4..c78c2ea2939922170866750927d79c5b6986b0b6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -18,7 +18,6 @@
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
index 46b1d816b5a49101f7fdd69d010eb83de769d24e..e55265ee0b817ef4f378304e444cda646ea1b4aa 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
@@ -18,7 +18,6 @@
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>

diff --git a/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml
index ee69898a545e8d74f4b8b5eb9be5ce95fe401ac8..d438e0a8c7e1dc7e0f6177c8aad17725e67861ca 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml
@@ -17,7 +17,6 @@
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>