diff mbox

[3/4] qemu: caps: check for q35/ICH9 disable S3/S4

Message ID e0a0b3f3b26bbc4a9aba819ae888075735633a50.1452375080.git.crobinso@redhat.com
State Accepted
Commit c77fd89000a756b93a0b2087c1e541e698850094
Headers show

Commit Message

Cole Robinson Jan. 9, 2016, 9:32 p.m. UTC
Update test data to match
---
 src/qemu/qemu_capabilities.c                     |  9 +++
 src/qemu/qemu_capabilities.h                     |  2 +
 tests/qemucapabilitiesdata/caps_1.2.2-1.replies  | 23 ++++--
 tests/qemucapabilitiesdata/caps_1.3.1-1.replies  | 22 ++++--
 tests/qemucapabilitiesdata/caps_1.4.2-1.replies  | 23 ++++--
 tests/qemucapabilitiesdata/caps_1.5.3-1.replies  | 22 ++++--
 tests/qemucapabilitiesdata/caps_1.6.0-1.replies  | 22 ++++--
 tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 22 ++++--
 tests/qemucapabilitiesdata/caps_2.1.1-1.replies  | 22 ++++--
 tests/qemucapabilitiesdata/caps_2.4.0-1.caps     |  2 +
 tests/qemucapabilitiesdata/caps_2.4.0-1.replies  | 92 ++++++++++++++++++++++--
 tests/qemucapabilitiesdata/caps_2.5.0-1.caps     |  2 +
 tests/qemucapabilitiesdata/caps_2.5.0-1.replies  | 92 ++++++++++++++++++++++--
 tests/qemucapabilitiesdata/caps_2.6.0-1.caps     |  2 +
 tests/qemucapabilitiesdata/caps_2.6.0-1.replies  | 92 ++++++++++++++++++++++--
 15 files changed, 379 insertions(+), 70 deletions(-)

-- 
2.5.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Comments

Cole Robinson Jan. 9, 2016, 9:35 p.m. UTC | #1
On 01/09/2016 04:32 PM, Cole Robinson wrote:
> Update test data to match

> ---

>  src/qemu/qemu_capabilities.c                     |  9 +++

>  src/qemu/qemu_capabilities.h                     |  2 +

>  tests/qemucapabilitiesdata/caps_1.2.2-1.replies  | 23 ++++--

>  tests/qemucapabilitiesdata/caps_1.3.1-1.replies  | 22 ++++--

>  tests/qemucapabilitiesdata/caps_1.4.2-1.replies  | 23 ++++--

>  tests/qemucapabilitiesdata/caps_1.5.3-1.replies  | 22 ++++--

>  tests/qemucapabilitiesdata/caps_1.6.0-1.replies  | 22 ++++--

>  tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 22 ++++--

>  tests/qemucapabilitiesdata/caps_2.1.1-1.replies  | 22 ++++--

>  tests/qemucapabilitiesdata/caps_2.4.0-1.caps     |  2 +

>  tests/qemucapabilitiesdata/caps_2.4.0-1.replies  | 92 ++++++++++++++++++++++--

>  tests/qemucapabilitiesdata/caps_2.5.0-1.caps     |  2 +

>  tests/qemucapabilitiesdata/caps_2.5.0-1.replies  | 92 ++++++++++++++++++++++--

>  tests/qemucapabilitiesdata/caps_2.6.0-1.caps     |  2 +

>  tests/qemucapabilitiesdata/caps_2.6.0-1.replies  | 92 ++++++++++++++++++++++--

>  15 files changed, 379 insertions(+), 70 deletions(-)


I forgot to add a comment here... what is the recommended way to regenerate
this data? I did it by hand which was not fun

- Cole

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
diff mbox

Patch

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 475febc..92f42dc 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -309,6 +309,8 @@  VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "virtio-tablet", /* 205 */
               "virtio-input-host",
               "chardev-file-append",
+              "ich9-disable-s3",
+              "ich9-disable-s4",
     );
 
 
@@ -1650,6 +1652,11 @@  static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioGpu[] = {
     { "virgl", QEMU_CAPS_DEVICE_VIRTIO_GPU_VIRGL },
 };
 
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsICH9[] = {
+    { "disable_s3", QEMU_CAPS_ICH9_DISABLE_S3 },
+    { "disable_s4", QEMU_CAPS_ICH9_DISABLE_S4 },
+};
+
 struct virQEMUCapsObjectTypeProps {
     const char *type;
     struct virQEMUCapsStringFlags *props;
@@ -1705,6 +1712,8 @@  static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
       ARRAY_CARDINALITY(virQEMUCapsObjectPropsQxlVga) },
     { "virtio-gpu-pci", virQEMUCapsObjectPropsVirtioGpu,
       ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu) },
+    { "ICH9-LPC", virQEMUCapsObjectPropsICH9,
+      ARRAY_CARDINALITY(virQEMUCapsObjectPropsICH9) },
 };
 
 
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 99879d8..336031d 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -336,6 +336,8 @@  typedef enum {
     QEMU_CAPS_VIRTIO_TABLET, /* -device virtio-tablet-{device,pci} */
     QEMU_CAPS_VIRTIO_INPUT_HOST, /* -device virtio-input-host-{device,pci} */
     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 */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.replies b/tests/qemucapabilitiesdata/caps_1.2.2-1.replies
index e7de77b..e6cf089 100644
--- a/tests/qemucapabilitiesdata/caps_1.2.2-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.replies
@@ -1606,6 +1606,15 @@ 
 }
 
 {
+    "id": "libvirt-32",
+    "error": {
+        "class": "DeviceNotFound",
+        "desc": "Device 'ICH9-LPC' not found"
+    }
+}
+
+
+{
     "return": [
         {
             "name": "xenpv"
@@ -1649,7 +1658,7 @@ 
             "name": "none"
         }
     ],
-    "id": "libvirt-32"
+    "id": "libvirt-33"
 }
 
 {
@@ -1721,7 +1730,7 @@ 
             "name": "Opteron_G4"
         }
     ],
-    "id": "libvirt-33"
+    "id": "libvirt-34"
 }
 
 {
@@ -1729,11 +1738,11 @@ 
         "enabled": false,
         "present": true
     },
-    "id": "libvirt-34"
+    "id": "libvirt-35"
 }
 
 {
-    "id": "libvirt-35",
+    "id": "libvirt-36",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-tpm-models has not been found"
@@ -1741,7 +1750,7 @@ 
 }
 
 {
-    "id": "libvirt-36",
+    "id": "libvirt-37",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-tpm-types has not been found"
@@ -1749,7 +1758,7 @@ 
 }
 
 {
-    "id": "libvirt-37",
+    "id": "libvirt-38",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-command-line-options has not been found"
@@ -1763,5 +1772,5 @@ 
             "state": false
         }
     ],
-    "id": "libvirt-38"
+    "id": "libvirt-39"
 }
diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.replies b/tests/qemucapabilitiesdata/caps_1.3.1-1.replies
index bf9cbad..cd48ead 100644
--- a/tests/qemucapabilitiesdata/caps_1.3.1-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.replies
@@ -1785,6 +1785,14 @@ 
 }
 
 {
+    "id": "libvirt-33",
+    "error": {
+        "class": "DeviceNotFound",
+        "desc": "Device 'ICH9-LPC' not found"
+    }
+}
+
+{
     "return": [
         {
             "name": "xenpv"
@@ -1835,7 +1843,7 @@ 
             "name": "none"
         }
     ],
-    "id": "libvirt-33"
+    "id": "libvirt-34"
 }
 
 {
@@ -1913,7 +1921,7 @@ 
             "name": "Opteron_G5"
         }
     ],
-    "id": "libvirt-34"
+    "id": "libvirt-35"
 }
 
 {
@@ -1921,11 +1929,11 @@ 
         "enabled": false,
         "present": true
     },
-    "id": "libvirt-35"
+    "id": "libvirt-36"
 }
 
 {
-    "id": "libvirt-36",
+    "id": "libvirt-37",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-tpm-models has not been found"
@@ -1933,7 +1941,7 @@ 
 }
 
 {
-    "id": "libvirt-37",
+    "id": "libvirt-38",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-tpm-types has not been found"
@@ -1941,7 +1949,7 @@ 
 }
 
 {
-    "id": "libvirt-38",
+    "id": "libvirt-39",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-command-line-options has not been found"
@@ -1955,5 +1963,5 @@ 
             "state": false
         }
     ],
-    "id": "libvirt-39"
+    "id": "libvirt-40"
 }
diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.replies b/tests/qemucapabilitiesdata/caps_1.4.2-1.replies
index bd7980f..5e8bdb4 100644
--- a/tests/qemucapabilitiesdata/caps_1.4.2-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.replies
@@ -1832,6 +1832,15 @@ 
 }
 
 {
+    "id": "libvirt-33",
+    "error": {
+        "class": "DeviceNotFound",
+        "desc": "Device 'ICH9-LPC' not found"
+    }
+}
+
+
+{
     "return": [
         {
             "name": "xenpv"
@@ -1885,7 +1894,7 @@ 
             "name": "none"
         }
     ],
-    "id": "libvirt-33"
+    "id": "libvirt-34"
 }
 
 {
@@ -1963,7 +1972,7 @@ 
             "name": "qemu64"
         }
     ],
-    "id": "libvirt-34"
+    "id": "libvirt-35"
 }
 
 {
@@ -1971,11 +1980,11 @@ 
         "enabled": false,
         "present": true
     },
-    "id": "libvirt-35"
+    "id": "libvirt-36"
 }
 
 {
-    "id": "libvirt-36",
+    "id": "libvirt-37",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-tpm-models has not been found"
@@ -1983,7 +1992,7 @@ 
 }
 
 {
-    "id": "libvirt-37",
+    "id": "libvirt-38",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-tpm-types has not been found"
@@ -1991,7 +2000,7 @@ 
 }
 
 {
-    "id": "libvirt-38",
+    "id": "libvirt-39",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-command-line-options has not been found"
@@ -2005,5 +2014,5 @@ 
             "state": false
         }
     ],
-    "id": "libvirt-39"
+    "id": "libvirt-40"
 }
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.replies b/tests/qemucapabilitiesdata/caps_1.5.3-1.replies
index abdba6c..1f4081e 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.replies
@@ -1906,6 +1906,14 @@ 
 }
 
 {
+    "id": "libvirt-33",
+    "error": {
+        "class": "DeviceNotFound",
+        "desc": "Device 'ICH9-LPC' not found"
+    }
+}
+
+{
     "return": [
         {
             "name": "pc-q35-1.4",
@@ -1975,7 +1983,7 @@ 
             "cpu-max": 1
         }
     ],
-    "id": "libvirt-33"
+    "id": "libvirt-34"
 }
 
 {
@@ -2053,7 +2061,7 @@ 
             "name": "qemu64"
         }
     ],
-    "id": "libvirt-34"
+    "id": "libvirt-35"
 }
 
 {
@@ -2061,19 +2069,19 @@ 
         "enabled": false,
         "present": true
     },
-    "id": "libvirt-35"
+    "id": "libvirt-36"
 }
 
 {
     "return": [
     ],
-    "id": "libvirt-36"
+    "id": "libvirt-37"
 }
 
 {
     "return": [
     ],
-    "id": "libvirt-37"
+    "id": "libvirt-38"
 }
 
 {
@@ -2749,7 +2757,7 @@ 
             "option": "drive"
         }
     ],
-    "id": "libvirt-38"
+    "id": "libvirt-39"
 }
 
 {
@@ -2759,5 +2767,5 @@ 
             "state": false
         }
     ],
-    "id": "libvirt-39"
+    "id": "libvirt-40"
 }
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.replies b/tests/qemucapabilitiesdata/caps_1.6.0-1.replies
index 26a0e9d..63dcde6 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.replies
@@ -1968,6 +1968,14 @@ 
 }
 
 {
+    "id": "libvirt-33",
+    "error": {
+        "class": "DeviceNotFound",
+        "desc": "Device 'ICH9-LPC' not found"
+    }
+}
+
+{
     "return": [
         {
             "name": "xenpv",
@@ -2053,7 +2061,7 @@ 
             "cpu-max": 1
         }
     ],
-    "id": "libvirt-33"
+    "id": "libvirt-34"
 }
 
 {
@@ -2131,7 +2139,7 @@ 
             "name": "qemu64"
         }
     ],
-    "id": "libvirt-34"
+    "id": "libvirt-35"
 }
 
 {
@@ -2139,19 +2147,19 @@ 
         "enabled": false,
         "present": true
     },
-    "id": "libvirt-35"
+    "id": "libvirt-36"
 }
 
 {
     "return": [
     ],
-    "id": "libvirt-36"
+    "id": "libvirt-37"
 }
 
 {
     "return": [
     ],
-    "id": "libvirt-37"
+    "id": "libvirt-38"
 }
 
 {
@@ -2729,7 +2737,7 @@ 
             "option": "drive"
         }
     ],
-    "id": "libvirt-38"
+    "id": "libvirt-39"
 }
 
 {
@@ -2751,5 +2759,5 @@ 
             "state": false
         }
     ],
-    "id": "libvirt-39"
+    "id": "libvirt-40"
 }
diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.replies b/tests/qemucapabilitiesdata/caps_1.6.50-1.replies
index 5c493b7..869b5ed 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.50-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.replies
@@ -1932,6 +1932,14 @@ 
 }
 
 {
+    "id": "libvirt-33",
+    "error": {
+        "class": "DeviceNotFound",
+        "desc": "Device 'ICH9-LPC' not found"
+    }
+}
+
+{
     "return": [
         {
             "name": "xenpv",
@@ -2025,7 +2033,7 @@ 
             "cpu-max": 1
         }
     ],
-    "id": "libvirt-33"
+    "id": "libvirt-34"
 }
 
 {
@@ -2103,7 +2111,7 @@ 
             "name": "qemu64"
         }
     ],
-    "id": "libvirt-34"
+    "id": "libvirt-35"
 }
 
 {
@@ -2111,19 +2119,19 @@ 
         "enabled": false,
         "present": true
     },
-    "id": "libvirt-35"
+    "id": "libvirt-36"
 }
 
 {
     "return": [
     ],
-    "id": "libvirt-36"
+    "id": "libvirt-37"
 }
 
 {
     "return": [
     ],
-    "id": "libvirt-37"
+    "id": "libvirt-38"
 }
 
 {
@@ -2711,7 +2719,7 @@ 
             "option": "drive"
         }
     ],
-    "id": "libvirt-38"
+    "id": "libvirt-39"
 }
 
 {
@@ -2733,5 +2741,5 @@ 
             "state": false
         }
     ],
-    "id": "libvirt-39"
+    "id": "libvirt-40"
 }
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.replies b/tests/qemucapabilitiesdata/caps_2.1.1-1.replies
index ba85b28..86047c1 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1-1.replies
+++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.replies
@@ -2378,6 +2378,14 @@ 
 }
 
 {
+    "id": "libvirt-33",
+    "error": {
+        "class": "DeviceNotFound",
+        "desc": "Device 'ICH9-LPC' not found"
+    }
+}
+
+{
   "return": [
     {
       "name": "pc-1.3",
@@ -2487,7 +2495,7 @@ 
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-34"
 }
 
 {
@@ -2568,7 +2576,7 @@ 
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-35"
 }
 
 {
@@ -2576,21 +2584,21 @@ 
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-35"
+  "id": "libvirt-36"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-37"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }
 
 {
@@ -3450,7 +3458,7 @@ 
       "option": "drive"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-39"
 }
 
 {
@@ -3472,5 +3480,5 @@ 
       "capability": "zero-blocks"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
index d67a48d..ffc09c6 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
@@ -167,4 +167,6 @@ 
     <flag name='virtio-mouse'/>
     <flag name='virtio-tablet'/>
     <flag name='virtio-input-host'/>
+    <flag name='ich9-disable-s3'/>
+    <flag name='ich9-disable-s4'/>
   </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.replies b/tests/qemucapabilitiesdata/caps_2.4.0-1.replies
index 8f50128..8d25759 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0-1.replies
+++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.replies
@@ -2759,6 +2759,84 @@ 
 }
 
 {
+  "return":  [
+    {
+      "type": "bool",
+      "name": "memory-hotplug-support"
+    },
+    {
+      "type": "uint32",
+      "name": "rombar"
+    },
+    {
+      "type": "uint32",
+      "name": "sci_int"
+    },
+    {
+      "type": "uint32",
+      "name": "gpe0_blk_len"
+    },
+    {
+      "type": "uint32",
+      "name": "pm_io_base"
+    },
+    {
+      "type": "bool",
+      "name": "noreboot"
+    },
+    {
+      "type": "bool",
+      "name": "multifunction",
+      "description": "on/off"
+    },
+    {
+      "type": "uint8",
+      "name": "disable_s4"
+    },
+    {
+      "type": "uint8",
+      "name": "acpi_disable_cmd"
+    },
+    {
+      "type": "str",
+      "name": "romfile"
+    },
+    {
+      "type": "uint8",
+      "name": "disable_s3"
+    },
+    {
+      "type": "uint8",
+      "name": "s4_val"
+    },
+    {
+      "type": "uint8",
+      "name": "acpi_enable_cmd"
+    },
+    {
+      "type": "bool",
+      "name": "command_serr_enable",
+      "description": "on/off"
+    },
+    {
+      "type": "int32",
+      "name": "addr",
+      "description": "Slot and optional function number, example: 06.0 or 06"
+    },
+    {
+      "type": "bool",
+      "name": "enable_tco"
+    },
+    {
+      "type": "uint32",
+      "name": "gpe0_blk"
+    }
+  ],
+  "id": "libvirt-33"
+}
+
+
+{
   "return": [
     {
       "name": "pc-i440fx-2.4",
@@ -2884,7 +2962,7 @@ 
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-34"
 }
 
 {
@@ -2974,7 +3052,7 @@ 
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-35"
 }
 
 {
@@ -2982,21 +3060,21 @@ 
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-35"
+  "id": "libvirt-36"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-37"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }
 
 {
@@ -4000,7 +4078,7 @@ 
       "option": "drive"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-39"
 }
 
 {
@@ -4030,5 +4108,5 @@ 
       "capability": "events"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
index f4f3673..2a4f5c0 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
@@ -168,4 +168,6 @@ 
     <flag name='virtio-mouse'/>
     <flag name='virtio-tablet'/>
     <flag name='virtio-input-host'/>
+    <flag name='ich9-disable-s3'/>
+    <flag name='ich9-disable-s4'/>
   </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.replies b/tests/qemucapabilitiesdata/caps_2.5.0-1.replies
index d90a74b..fc3f699 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0-1.replies
+++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.replies
@@ -2764,6 +2764,84 @@ 
 }
 
 {
+  "return":  [
+    {
+      "type": "bool",
+      "name": "memory-hotplug-support"
+    },
+    {
+      "type": "uint32",
+      "name": "rombar"
+    },
+    {
+      "type": "uint32",
+      "name": "sci_int"
+    },
+    {
+      "type": "uint32",
+      "name": "gpe0_blk_len"
+    },
+    {
+      "type": "uint32",
+      "name": "pm_io_base"
+    },
+    {
+      "type": "bool",
+      "name": "noreboot"
+    },
+    {
+      "type": "bool",
+      "name": "multifunction",
+      "description": "on/off"
+    },
+    {
+      "type": "uint8",
+      "name": "disable_s4"
+    },
+    {
+      "type": "uint8",
+      "name": "acpi_disable_cmd"
+    },
+    {
+      "type": "str",
+      "name": "romfile"
+    },
+    {
+      "type": "uint8",
+      "name": "disable_s3"
+    },
+    {
+      "type": "uint8",
+      "name": "s4_val"
+    },
+    {
+      "type": "uint8",
+      "name": "acpi_enable_cmd"
+    },
+    {
+      "type": "bool",
+      "name": "command_serr_enable",
+      "description": "on/off"
+    },
+    {
+      "type": "int32",
+      "name": "addr",
+      "description": "Slot and optional function number, example: 06.0 or 06"
+    },
+    {
+      "type": "bool",
+      "name": "enable_tco"
+    },
+    {
+      "type": "uint32",
+      "name": "gpe0_blk"
+    }
+  ],
+  "id": "libvirt-33"
+}
+
+
+{
   "return": [
     {
       "name": "pc-i440fx-2.4",
@@ -2889,7 +2967,7 @@ 
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-34"
 }
 
 {
@@ -2979,7 +3057,7 @@ 
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-35"
 }
 
 {
@@ -2987,21 +3065,21 @@ 
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-35"
+  "id": "libvirt-36"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-37"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }
 
 {
@@ -4005,7 +4083,7 @@ 
       "option": "drive"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-39"
 }
 
 {
@@ -4035,5 +4113,5 @@ 
       "capability": "events"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
index e296efc..944208e 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
@@ -170,4 +170,6 @@ 
     <flag name='virtio-tablet'/>
     <flag name='virtio-input-host'/>
     <flag name='chardev-file-append'/>
+    <flag name='ich9-disable-s3'/>
+    <flag name='ich9-disable-s4'/>
   </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.replies b/tests/qemucapabilitiesdata/caps_2.6.0-1.replies
index 90a1d61..304f918 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0-1.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.replies
@@ -2764,6 +2764,84 @@ 
 }
 
 {
+  "return":  [
+    {
+      "type": "bool",
+      "name": "memory-hotplug-support"
+    },
+    {
+      "type": "uint32",
+      "name": "rombar"
+    },
+    {
+      "type": "uint32",
+      "name": "sci_int"
+    },
+    {
+      "type": "uint32",
+      "name": "gpe0_blk_len"
+    },
+    {
+      "type": "uint32",
+      "name": "pm_io_base"
+    },
+    {
+      "type": "bool",
+      "name": "noreboot"
+    },
+    {
+      "type": "bool",
+      "name": "multifunction",
+      "description": "on/off"
+    },
+    {
+      "type": "uint8",
+      "name": "disable_s4"
+    },
+    {
+      "type": "uint8",
+      "name": "acpi_disable_cmd"
+    },
+    {
+      "type": "str",
+      "name": "romfile"
+    },
+    {
+      "type": "uint8",
+      "name": "disable_s3"
+    },
+    {
+      "type": "uint8",
+      "name": "s4_val"
+    },
+    {
+      "type": "uint8",
+      "name": "acpi_enable_cmd"
+    },
+    {
+      "type": "bool",
+      "name": "command_serr_enable",
+      "description": "on/off"
+    },
+    {
+      "type": "int32",
+      "name": "addr",
+      "description": "Slot and optional function number, example: 06.0 or 06"
+    },
+    {
+      "type": "bool",
+      "name": "enable_tco"
+    },
+    {
+      "type": "uint32",
+      "name": "gpe0_blk"
+    }
+  ],
+  "id": "libvirt-33"
+}
+
+
+{
   "return": [
     {
       "name": "pc-i440fx-2.4",
@@ -2889,7 +2967,7 @@ 
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-34"
 }
 
 {
@@ -2979,7 +3057,7 @@ 
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-35"
 }
 
 {
@@ -2987,21 +3065,21 @@ 
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-35"
+  "id": "libvirt-36"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-37"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }
 
 {
@@ -4009,7 +4087,7 @@ 
       "option": "drive"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-39"
 }
 
 {
@@ -4039,5 +4117,5 @@ 
       "capability": "events"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }