qemu: add capability check for memballoon 'deflate-on-oom' feature

Add appropriate capability check and new virQEMUCaps flag for the new
virtio balloon feature. QEMU commit with the complete feature description:
http://git.qemu.org/?p=qemu.git;a=commit;h=e3816255bf4b6377bb405331e2ee0dc14d841b80

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 4583a8a53e44007b483086a5616b42caca559fba..3099e344b0951927f31fadf237874e3b56d4f598 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1,7 +1,7 @@
 /*
  * qemu_capabilities.c: QEMU capabilities generation
  *
- * Copyright (C) 2006-2015 Red Hat, Inc.
+ * Copyright (C) 2006-2016 Red Hat, Inc.
  * Copyright (C) 2006 Daniel P. Berrange
  *
  * This library is free software; you can redistribute it and/or
@@ -313,6 +313,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "ich9-disable-s4",
 
               "vserport-change-event", /* 210 */
+              "virtio-balloon-pci.deflate-on-oom",
     );
 
 
@@ -1568,6 +1569,10 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
     { "virtio-input-host-pci", QEMU_CAPS_VIRTIO_INPUT_HOST },
 };
 
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = {
+    { "deflate-on-oom", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE },
+};
+
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = {
     { "multifunction", QEMU_CAPS_PCI_MULTIFUNCTION },
     { "bootindex", QEMU_CAPS_BOOTINDEX },
@@ -1717,6 +1722,12 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
       ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu) },
     { "ICH9-LPC", virQEMUCapsObjectPropsICH9,
       ARRAY_CARDINALITY(virQEMUCapsObjectPropsICH9) },
+    { "virtio-balloon-pci", virQEMUCapsObjectPropsVirtioBalloon,
+      ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon) },
+    { "virtio-balloon-ccw", virQEMUCapsObjectPropsVirtioBalloon,
+      ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon) },
+    { "virtio-balloon-device", virQEMUCapsObjectPropsVirtioBalloon,
+      ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon) },
 };
 
 

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index d0b941e85e84a8c90429c003e3feebe1bc6065a1..e5353dee34a6cff247663fdb19b75800e1ddc552 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -1,7 +1,7 @@
 /*
  * qemu_capabilities.h: QEMU capabilities generation
  *
- * Copyright (C) 2006-2015 Red Hat, Inc.
+ * Copyright (C) 2006-2016 Red Hat, Inc.
  * Copyright (C) 2006 Daniel P. Berrange
  *
  * This library is free software; you can redistribute it and/or
@@ -341,6 +341,8 @@ typedef enum {
 
     /* 210 */
     QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */
+    QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,ccw}.
+                                           * deflate-on-oom */
 
     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 e6cf089a05ba07e947effea00b61b1b33ae61c45..fbddf3db309284fc088f003e073b08c90e272e77 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.2.2-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.replies
@@ -1614,6 +1614,60 @@
 }
 
 
+{
+    "return": [
+        {
+             "name": "command_serr_enable",
+             "type": "on/off"
+        },
+        {
+            "name": "multifunction",
+            "type": "on/off"
+        },
+        {
+            "name": "rombar",
+            "type": "uint32"
+        },
+        {
+            "name": "romfile",
+            "type": "string"
+        },
+        {
+            "name": "addr",
+            "type": "pci-devfn"
+        },
+        {
+            "name": "class",
+            "type": "hex32"
+        },
+        {
+            "name": "event_idx",
+            "type": "on/off"
+        },
+        {
+            "name": "indirect_desc",
+            "type": "on/off"
+        }
+    ],
+    "id": "libvirt-33"
+}
+
+{
+    "id": "libvirt-34",
+    "error": {
+        "class": "DeviceNotFound",
+        "desc": "Device 'virtio-balloon-ccw' not found"
+    }
+}
+
+{
+    "id": "libvirt-35",
+    "error": {
+        "class": "DeviceNotFound",
+        "desc": "Device 'virtio-balloon-device' not found"
+    }
+}
+
 {
     "return": [
         {
@@ -1658,7 +1712,7 @@
             "name": "none"
         }
     ],
-    "id": "libvirt-33"
+    "id": "libvirt-36"
 }
 
 {
@@ -1730,7 +1784,7 @@
             "name": "Opteron_G4"
         }
     ],
-    "id": "libvirt-34"
+    "id": "libvirt-37"
 }
 
 {
@@ -1738,11 +1792,11 @@
         "enabled": false,
         "present": true
     },
-    "id": "libvirt-35"
+    "id": "libvirt-38"
 }
 
 {
-    "id": "libvirt-36",
+    "id": "libvirt-39",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-tpm-models has not been found"
@@ -1750,7 +1804,7 @@
 }
 
 {
-    "id": "libvirt-37",
+    "id": "libvirt-40",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-tpm-types has not been found"
@@ -1758,7 +1812,7 @@
 }
 
 {
-    "id": "libvirt-38",
+    "id": "libvirt-41",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-command-line-options has not been found"
@@ -1772,5 +1826,5 @@
             "state": false
         }
     ],
-    "id": "libvirt-39"
+    "id": "libvirt-42"
 }

diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.replies b/tests/qemucapabilitiesdata/caps_1.3.1-1.replies
index cd48ead4a79f6d051099c49ab3ecd09950ac2fa0..2542b67b49cd3b0b553a95844b1cd9f8b2d7cd10 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.3.1-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.replies
@@ -1792,6 +1792,60 @@
     }
 }
 
+{
+    "return": [
+        {
+             "name": "command_serr_enable",
+             "type": "on/off"
+        },
+        {
+            "name": "multifunction",
+            "type": "on/off"
+        },
+        {
+            "name": "rombar",
+            "type": "uint32"
+        },
+        {
+            "name": "romfile",
+            "type": "string"
+        },
+        {
+            "name": "addr",
+            "type": "pci-devfn"
+        },
+        {
+            "name": "class",
+            "type": "hex32"
+        },
+        {
+            "name": "event_idx",
+            "type": "on/off"
+        },
+        {
+            "name": "indirect_desc",
+            "type": "on/off"
+        }
+    ],
+    "id": "libvirt-34"
+}
+
+{
+    "id": "libvirt-35",
+    "error": {
+        "class": "DeviceNotFound",
+        "desc": "Device 'virtio-balloon-ccw' not found"
+    }
+}
+
+{
+    "id": "libvirt-36",
+    "error": {
+        "class": "DeviceNotFound",
+        "desc": "Device 'virtio-balloon-device' not found"
+    }
+}
+
 {
     "return": [
         {
@@ -1843,7 +1897,7 @@
             "name": "none"
         }
     ],
-    "id": "libvirt-34"
+    "id": "libvirt-37"
 }
 
 {
@@ -1921,7 +1975,7 @@
             "name": "Opteron_G5"
         }
     ],
-    "id": "libvirt-35"
+    "id": "libvirt-38"
 }
 
 {
@@ -1929,11 +1983,11 @@
         "enabled": false,
         "present": true
     },
-    "id": "libvirt-36"
+    "id": "libvirt-39"
 }
 
 {
-    "id": "libvirt-37",
+    "id": "libvirt-40",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-tpm-models has not been found"
@@ -1941,7 +1995,7 @@
 }
 
 {
-    "id": "libvirt-38",
+    "id": "libvirt-41",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-tpm-types has not been found"
@@ -1949,7 +2003,7 @@
 }
 
 {
-    "id": "libvirt-39",
+    "id": "libvirt-42",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-command-line-options has not been found"
@@ -1963,5 +2017,5 @@
             "state": false
         }
     ],
-    "id": "libvirt-40"
+    "id": "libvirt-43"
 }

diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.replies b/tests/qemucapabilitiesdata/caps_1.4.2-1.replies
index 5e8bdb4032eea8c32aa2942318b2cd5fc15b05d0..46c329272f29c23c0b0dad9f7f03a7d60bf51860 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.4.2-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.replies
@@ -1840,6 +1840,60 @@
 }
 
 
+{
+    "return": [
+        {
+             "name": "command_serr_enable",
+             "type": "on/off"
+        },
+        {
+            "name": "multifunction",
+            "type": "on/off"
+        },
+        {
+            "name": "rombar",
+            "type": "uint32"
+        },
+        {
+            "name": "romfile",
+            "type": "string"
+        },
+        {
+            "name": "addr",
+            "type": "pci-devfn"
+        },
+        {
+            "name": "class",
+            "type": "hex32"
+        },
+        {
+            "name": "event_idx",
+            "type": "on/off"
+        },
+        {
+            "name": "indirect_desc",
+            "type": "on/off"
+        }
+    ],
+    "id": "libvirt-34"
+}
+
+{
+    "id": "libvirt-35",
+    "error": {
+        "class": "DeviceNotFound",
+        "desc": "Device 'virtio-balloon-ccw' not found"
+    }
+}
+
+{
+    "id": "libvirt-36",
+    "error": {
+        "class": "DeviceNotFound",
+        "desc": "Device 'virtio-balloon-device' not found"
+    }
+}
+
 {
     "return": [
         {
@@ -1894,7 +1948,7 @@
             "name": "none"
         }
     ],
-    "id": "libvirt-34"
+    "id": "libvirt-37"
 }
 
 {
@@ -1972,7 +2026,7 @@
             "name": "qemu64"
         }
     ],
-    "id": "libvirt-35"
+    "id": "libvirt-38"
 }
 
 {
@@ -1980,11 +2034,11 @@
         "enabled": false,
         "present": true
     },
-    "id": "libvirt-36"
+    "id": "libvirt-39"
 }
 
 {
-    "id": "libvirt-37",
+    "id": "libvirt-40",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-tpm-models has not been found"
@@ -1992,7 +2046,7 @@
 }
 
 {
-    "id": "libvirt-38",
+    "id": "libvirt-41",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-tpm-types has not been found"
@@ -2000,7 +2054,7 @@
 }
 
 {
-    "id": "libvirt-39",
+    "id": "libvirt-42",
     "error": {
         "class": "CommandNotFound",
         "desc": "The command query-command-line-options has not been found"
@@ -2014,5 +2068,5 @@
             "state": false
         }
     ],
-    "id": "libvirt-40"
+    "id": "libvirt-43"
 }

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.replies b/tests/qemucapabilitiesdata/caps_1.5.3-1.replies
index 1f4081eaec8fad5aff389cc90b84e00c771a3a98..37a735f6c1630fcf7763f36abe7483fb56c3379d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.replies
@@ -1913,6 +1913,58 @@
     }
 }
 
+{
+    "return": [
+        {
+             "name": "command_serr_enable",
+             "type": "on/off"
+        },
+        {
+            "name": "multifunction",
+            "type": "on/off"
+        },
+        {
+            "name": "rombar",
+            "type": "uint32"
+        },
+        {
+            "name": "romfile",
+            "type": "string"
+        },
+        {
+            "name": "addr",
+            "type": "pci-devfn"
+        },
+        {
+            "name": "class",
+            "type": "hex32"
+        },
+        {
+            "name": "event_idx",
+            "type": "on/off"
+        },
+        {
+            "name": "indirect_desc",
+            "type": "on/off"
+        }
+    ],
+    "id": "libvirt-34"
+}
+
+{
+    "id": "libvirt-35",
+    "error": {
+        "class": "DeviceNotFound",
+        "desc": "Device 'virtio-balloon-ccw' not found"
+    }
+}
+
+{
+    "return": [
+    ],
+    "id": "libvirt-36"
+}
+
 {
     "return": [
         {
@@ -1983,7 +2035,7 @@
             "cpu-max": 1
         }
     ],
-    "id": "libvirt-34"
+    "id": "libvirt-37"
 }
 
 {
@@ -2061,7 +2113,7 @@
             "name": "qemu64"
         }
     ],
-    "id": "libvirt-35"
+    "id": "libvirt-38"
 }
 
 {
@@ -2069,19 +2121,19 @@
         "enabled": false,
         "present": true
     },
-    "id": "libvirt-36"
+    "id": "libvirt-39"
 }
 
 {
     "return": [
     ],
-    "id": "libvirt-37"
+    "id": "libvirt-40"
 }
 
 {
     "return": [
     ],
-    "id": "libvirt-38"
+    "id": "libvirt-41"
 }
 
 {
@@ -2757,7 +2809,7 @@
             "option": "drive"
         }
     ],
-    "id": "libvirt-39"
+    "id": "libvirt-42"
 }
 
 {
@@ -2767,5 +2819,5 @@
             "state": false
         }
     ],
-    "id": "libvirt-40"
+    "id": "libvirt-43"
 }

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.replies b/tests/qemucapabilitiesdata/caps_1.6.0-1.replies
index 63dcde60c378731f3259b0e64ea1ccc5ed4273bf..89327022ba9d5c048bcac12e6638ca72deb4f514 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.replies
@@ -1975,6 +1975,58 @@
     }
 }
 
+{
+    "return": [
+        {
+             "name": "command_serr_enable",
+             "type": "on/off"
+        },
+        {
+            "name": "multifunction",
+            "type": "on/off"
+        },
+        {
+            "name": "rombar",
+            "type": "uint32"
+        },
+        {
+            "name": "romfile",
+            "type": "string"
+        },
+        {
+            "name": "addr",
+            "type": "pci-devfn"
+        },
+        {
+            "name": "class",
+            "type": "hex32"
+        },
+        {
+            "name": "event_idx",
+            "type": "on/off"
+        },
+        {
+            "name": "indirect_desc",
+            "type": "on/off"
+        }
+    ],
+    "id": "libvirt-34"
+}
+
+{
+    "id": "libvirt-35",
+    "error": {
+        "class": "DeviceNotFound",
+        "desc": "Device 'virtio-balloon-ccw' not found"
+    }
+}
+
+{
+    "return": [
+    ],
+    "id": "libvirt-36"
+}
+
 {
     "return": [
         {
@@ -2061,7 +2113,7 @@
             "cpu-max": 1
         }
     ],
-    "id": "libvirt-34"
+    "id": "libvirt-37"
 }
 
 {
@@ -2139,7 +2191,7 @@
             "name": "qemu64"
         }
     ],
-    "id": "libvirt-35"
+    "id": "libvirt-38"
 }
 
 {
@@ -2147,19 +2199,19 @@
         "enabled": false,
         "present": true
     },
-    "id": "libvirt-36"
+    "id": "libvirt-39"
 }
 
 {
     "return": [
     ],
-    "id": "libvirt-37"
+    "id": "libvirt-40"
 }
 
 {
     "return": [
     ],
-    "id": "libvirt-38"
+    "id": "libvirt-41"
 }
 
 {
@@ -2737,7 +2789,7 @@
             "option": "drive"
         }
     ],
-    "id": "libvirt-39"
+    "id": "libvirt-42"
 }
 
 {
@@ -2759,5 +2811,5 @@
             "state": false
         }
     ],
-    "id": "libvirt-40"
+    "id": "libvirt-43"
 }

diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.replies b/tests/qemucapabilitiesdata/caps_1.6.50-1.replies
index 869b5ed00d2db056101423e31741269bc5eab474..b9bb9a327d76787bf78ed453f1f4629bf9530d82 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.50-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.replies
@@ -1939,6 +1939,58 @@
     }
 }
 
+{
+    "return": [
+        {
+             "name": "command_serr_enable",
+             "type": "on/off"
+        },
+        {
+            "name": "multifunction",
+            "type": "on/off"
+        },
+        {
+            "name": "rombar",
+            "type": "uint32"
+        },
+        {
+            "name": "romfile",
+            "type": "string"
+        },
+        {
+            "name": "addr",
+            "type": "pci-devfn"
+        },
+        {
+            "name": "class",
+            "type": "hex32"
+        },
+        {
+            "name": "event_idx",
+            "type": "on/off"
+        },
+        {
+            "name": "indirect_desc",
+            "type": "on/off"
+        }
+    ],
+    "id": "libvirt-34"
+}
+
+{
+    "id": "libvirt-35",
+    "error": {
+        "class": "DeviceNotFound",
+        "desc": "Device 'virtio-balloon-ccw' not found"
+    }
+}
+
+{
+    "return": [
+    ],
+    "id": "libvirt-36"
+}
+
 {
     "return": [
         {
@@ -2033,7 +2085,7 @@
             "cpu-max": 1
         }
     ],
-    "id": "libvirt-34"
+    "id": "libvirt-37"
 }
 
 {
@@ -2111,7 +2163,7 @@
             "name": "qemu64"
         }
     ],
-    "id": "libvirt-35"
+    "id": "libvirt-38"
 }
 
 {
@@ -2119,19 +2171,19 @@
         "enabled": false,
         "present": true
     },
-    "id": "libvirt-36"
+    "id": "libvirt-39"
 }
 
 {
     "return": [
     ],
-    "id": "libvirt-37"
+    "id": "libvirt-40"
 }
 
 {
     "return": [
     ],
-    "id": "libvirt-38"
+    "id": "libvirt-41"
 }
 
 {
@@ -2719,7 +2771,7 @@
             "option": "drive"
         }
     ],
-    "id": "libvirt-39"
+    "id": "libvirt-42"
 }
 
 {
@@ -2741,5 +2793,5 @@
             "state": false
         }
     ],
-    "id": "libvirt-40"
+    "id": "libvirt-43"
 }

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.replies b/tests/qemucapabilitiesdata/caps_2.1.1-1.replies
index 86047c162b46639629c7a8e7ef83f034954c94fa..fabda5572f5d7eb17015cfaf9ff667bef9a1bd29 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1-1.replies
+++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.replies
@@ -2385,6 +2385,70 @@
     }
 }
 
+{
+  "return": [
+    {
+      "name": "guest-stats-polling-interval",
+      "type": "int"
+    },
+    {
+      "name": "guest-stats",
+      "type": "guest statistics"
+    },
+    {
+      "name": "virtio-backend",
+      "type": "child<virtio-balloon-device>"
+    },
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "str"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    },
+    {
+      "name": "event_idx",
+      "type": "on/off"
+    },
+    {
+      "name": "indirect_desc",
+      "type": "on/off"
+    },
+    {
+      "name": "class",
+      "type": "uint32"
+    }
+  ],
+  "id": "libvirt-34"
+}
+
+{
+  "id": "libvirt-35",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Device 'virtio-balloon-ccw' not found"
+  }
+}
+
+{
+  "return": [
+  ],
+  "id": "libvirt-36"
+}
+
 {
   "return": [
     {
@@ -2495,7 +2559,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-37"
 }
 
 {
@@ -2576,7 +2640,7 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-38"
 }
 
 {
@@ -2584,21 +2648,21 @@
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-36"
+  "id": "libvirt-39"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-40"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-41"
 }
 
 {
@@ -3458,7 +3522,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-42"
 }
 
 {
@@ -3480,5 +3544,5 @@
       "capability": "zero-blocks"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-43"
 }

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
index 97ac90118fbdf60bc7969e579b3261c2e0939df2..e411542762918e8cc42c53486ad24720471b9818 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
@@ -170,4 +170,5 @@
     <flag name='ich9-disable-s3'/>
     <flag name='ich9-disable-s4'/>
     <flag name='vserport-change-event'/>
+    <flag name='virtio-balloon-pci.deflate-on-oom'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.replies b/tests/qemucapabilitiesdata/caps_2.4.0-1.replies
index 8d25759cda8b01da03c737f261268e6ba3709ee2..299fdfc58c2a8a20e2ad0dc39da4f27500fa91ca 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0-1.replies
+++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.replies
@@ -2836,6 +2836,138 @@
 }
 
 
+{
+  "return": [
+    {
+      "name": "guest-stats-polling-interval",
+      "type": "int"
+    },
+    {
+      "name": "guest-stats",
+      "type": "guest statistics"
+    },
+    {
+      "name": "any_layout",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "notify_on_empty",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "event_idx",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "indirect_desc",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "deflate-on-oom",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "virtio-backend",
+      "type": "child<virtio-balloon-device>"
+    },
+    {
+      "name": "command_serr_enable",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "multifunction",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "str"
+    },
+    {
+      "name": "addr",
+      "description": "Slot and optional function number, example: 06.0 or 06",
+      "type": "int32"
+    },
+    {
+      "name": "disable-modern",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "disable-legacy",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "virtio-pci-bus-master-bug-migration",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "class",
+      "type": "uint32"
+    }
+  ],
+  "id": "libvirt-34"
+}
+
+{
+  "id": "libvirt-35",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Device 'virtio-balloon-ccw' not found"
+  }
+}
+
+{
+  "return": [
+    {
+      "name": "guest-stats-polling-interval",
+      "type": "int"
+    },
+    {
+      "name": "guest-stats",
+      "type": "guest statistics"
+    },
+    {
+      "name": "any_layout",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "notify_on_empty",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "event_idx",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "indirect_desc",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "deflate-on-oom",
+      "description": "on/off",
+      "type": "bool"
+    }
+  ],
+  "id": "libvirt-36"
+}
+
 {
   "return": [
     {
@@ -2962,7 +3094,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-37"
 }
 
 {
@@ -3052,7 +3184,7 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-38"
 }
 
 {
@@ -3060,21 +3192,21 @@
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-36"
+  "id": "libvirt-39"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-40"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-41"
 }
 
 {
@@ -4078,7 +4210,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-42"
 }
 
 {
@@ -4108,5 +4240,5 @@
       "capability": "events"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-43"
 }

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
index 1d49d9d236ee2bb9a74ffaa858c9d3f54e070361..931bc4fbcc5832e61f2d0d6f6c4cfd1c6e604005 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
@@ -171,4 +171,5 @@
     <flag name='ich9-disable-s3'/>
     <flag name='ich9-disable-s4'/>
     <flag name='vserport-change-event'/>
+    <flag name='virtio-balloon-pci.deflate-on-oom'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.replies b/tests/qemucapabilitiesdata/caps_2.5.0-1.replies
index fc3f6991953035af793490509cdebdb031e4b9cc..7b692b5017a35f40cc9b59bf2e354277a88c84b8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0-1.replies
+++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.replies
@@ -2841,6 +2841,153 @@
 }
 
 
+{
+  "return": [
+    {
+      "name": "disable-modern",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "virtio-pci-bus-master-bug-migration",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "class",
+      "type": "uint32"
+    },
+    {
+      "name": "indirect_desc",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "guest-stats-polling-interval",
+      "type": "int"
+    },
+    {
+      "name": "guest-stats",
+      "type": "guest statistics"
+    },
+    {
+      "name": "multifunction",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "migrate-extra",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "event_idx",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "modern-pio-notify",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "romfile",
+      "type": "str"
+    },
+    {
+      "name": "virtio-backend",
+      "type": "child<virtio-balloon-device>"
+    },
+    {
+      "name": "disable-legacy",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "command_serr_enable",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "x-disable-pcie",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "addr",
+      "description": "Slot and optional function number, example: 06.0 or 06",
+      "type": "int32"
+    },
+    {
+      "name": "any_layout",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "notify_on_empty",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "deflate-on-oom",
+      "description": "on/off",
+      "type": "bool"
+    }
+  ],
+  "id": "libvirt-34"
+}
+
+{
+  "id": "libvirt-35",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Device 'virtio-balloon-ccw' not found"
+  }
+}
+
+{
+  "return": [
+    {
+      "name": "notify_on_empty",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "any_layout",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "indirect_desc",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "guest-stats-polling-interval",
+      "type": "int"
+    },
+    {
+      "name": "guest-stats",
+      "type": "guest statistics"
+    },
+    {
+      "name": "event_idx",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "deflate-on-oom",
+      "description": "on/off",
+      "type": "bool"
+    }
+  ],
+  "id": "libvirt-36"
+}
+
 {
   "return": [
     {
@@ -2967,7 +3114,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-37"
 }
 
 {
@@ -3057,7 +3204,7 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-38"
 }
 
 {
@@ -3065,21 +3212,21 @@
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-36"
+  "id": "libvirt-39"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-40"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-41"
 }
 
 {
@@ -4083,7 +4230,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-42"
 }
 
 {
@@ -4113,5 +4260,5 @@
       "capability": "events"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-43"
 }

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
index 10c07cdf27d5e6403197f8ca6708622c562df126..f32d5aaa474205763560a4c80709b2430d56573e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
@@ -173,4 +173,5 @@
     <flag name='ich9-disable-s3'/>
     <flag name='ich9-disable-s4'/>
     <flag name='vserport-change-event'/>
+    <flag name='virtio-balloon-pci.deflate-on-oom'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.replies b/tests/qemucapabilitiesdata/caps_2.6.0-1.replies
index 304f9185f28c82acd44d8321424dc514c8ee9e25..8ee4bec76de51345a4319abf4c947534c4217862 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-1.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.replies
@@ -2841,6 +2841,153 @@
 }
 
 
+{
+  "return": [
+    {
+      "name": "disable-modern",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "virtio-pci-bus-master-bug-migration",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "class",
+      "type": "uint32"
+    },
+    {
+      "name": "indirect_desc",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "guest-stats-polling-interval",
+      "type": "int"
+    },
+    {
+      "name": "guest-stats",
+      "type": "guest statistics"
+    },
+    {
+      "name": "multifunction",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "migrate-extra",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "event_idx",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "modern-pio-notify",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "romfile",
+      "type": "str"
+    },
+    {
+      "name": "virtio-backend",
+      "type": "child<virtio-balloon-device>"
+    },
+    {
+      "name": "disable-legacy",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "command_serr_enable",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "x-disable-pcie",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "addr",
+      "description": "Slot and optional function number, example: 06.0 or 06",
+      "type": "int32"
+    },
+    {
+      "name": "any_layout",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "notify_on_empty",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "deflate-on-oom",
+      "description": "on/off",
+      "type": "bool"
+    }
+  ],
+  "id": "libvirt-34"
+}
+
+{
+  "id": "libvirt-35",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Device 'virtio-balloon-ccw' not found"
+  }
+}
+
+{
+  "return": [
+    {
+      "name": "notify_on_empty",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "any_layout",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "indirect_desc",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "guest-stats-polling-interval",
+      "type": "int"
+    },
+    {
+      "name": "guest-stats",
+      "type": "guest statistics"
+    },
+    {
+      "name": "event_idx",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "deflate-on-oom",
+      "description": "on/off",
+      "type": "bool"
+    }
+  ],
+  "id": "libvirt-36"
+}
+
 {
   "return": [
     {
@@ -2967,7 +3114,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-37"
 }
 
 {
@@ -3057,7 +3204,7 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-38"
 }
 
 {
@@ -3065,21 +3212,21 @@
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-36"
+  "id": "libvirt-39"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-40"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-41"
 }
 
 {
@@ -4087,7 +4234,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-42"
 }
 
 {
@@ -4117,5 +4264,5 @@
       "capability": "events"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-43"
 }