[libvirt] [PATCH v2 4/5] qemu_capabilities: Introduce QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD

Tuesday, 17 April 2018

This capability tracks if memory-backend-file has discard-data
attribute or not.

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt;
---
 src/qemu/qemu_capabilities.c                       |  17 +
 src/qemu/qemu_capabilities.h                       |   1 +
 .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies |  20 +-
 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml   |   2 +-
 .../caps_2.10.0.aarch64.replies                    |  30 +-
 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml |   2 +-
 .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies |  28 +-
 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml   |   2 +-
 .../qemucapabilitiesdata/caps_2.10.0.s390x.replies |  32 +-
 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml   |   2 +-
 .../caps_2.10.0.x86_64.replies                     | 540 +++++++++---------
 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml  |   2 +-
 .../qemucapabilitiesdata/caps_2.11.0.s390x.replies |  26 +-
 tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml   |   2 +-
 .../caps_2.12.0.aarch64.replies                    |  24 +-
 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml |   2 +-
 .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies |  22 +-
 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   |   2 +-
 .../qemucapabilitiesdata/caps_2.12.0.s390x.replies |  24 +-
 .../caps_2.12.0.x86_64.replies                     | 612 +++++++++++----------
 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  |   3 +-
 .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies |  20 +-
 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml   |   2 +-
 .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies |  22 +-
 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml   |   2 +-
 .../caps_2.6.0.aarch64.replies                     |  30 +-
 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml  |   2 +-
 .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies  |  28 +-
 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml    |   2 +-
 .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies |  22 +-
 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml   |   2 +-
 .../qemucapabilitiesdata/caps_2.7.0.s390x.replies  |  28 +-
 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml    |   2 +-
 .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies |  22 +-
 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml   |   2 +-
 .../qemucapabilitiesdata/caps_2.8.0.s390x.replies  |  32 +-
 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml    |   2 +-
 .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies |  22 +-
 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml   |   2 +-
 .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies  |  28 +-
 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml    |   2 +-
 .../qemucapabilitiesdata/caps_2.9.0.s390x.replies  |  32 +-
 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml    |   2 +-
 .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 536 +++++++++---------
 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml   |   2 +-
 45 files changed, 1241 insertions(+), 1000 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c3fb0d704f..762b4ea32c 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -468,6 +468,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "virtio-tablet-ccw",
               "qcow2-luks",
               "pcie-pci-bridge",
+              "memory-backend-file.discard-data",
     );
 
 
@@ -1360,6 +1361,15 @@ static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] = {
       QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW },
 };
 
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendFile[] = {
+    { "discard-data", QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD },
+};
+
+static virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
+    { "memory-backend-file", virQEMUCapsObjectPropsMemoryBackendFile,
+      ARRAY_CARDINALITY(virQEMUCapsObjectPropsMemoryBackendFile),
+      QEMU_CAPS_OBJECT_MEMORY_FILE },
+};
 
 static void
 virQEMUCapsProcessStringFlags(virQEMUCapsPtr qemuCaps,
@@ -2117,6 +2127,13 @@ virQEMUCapsProbeQMPDevices(virQEMUCapsPtr qemuCaps,
                                         qemuMonitorGetDeviceProps) < 0)
         return -1;
 
+    if (virQEMUCapsProbeQMPGenericProps(qemuCaps,
+                                        mon,
+                                        virQEMUCapsObjectProps,
+                                        ARRAY_CARDINALITY(virQEMUCapsObjectProps),
+                                        qemuMonitorGetObjectProps) < 0)
+        return -1;
+
     return 0;
 }
 
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index a95993196b..fa6a18479d 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -452,6 +452,7 @@ typedef enum {
     QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW, /* -device virtio-tablet-ccw */
     QEMU_CAPS_QCOW2_LUKS, /* qcow2 format support LUKS encryption */
     QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, /* -device pcie-pci-bridge */
+    QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD, /* -object memory-backend-dile,discard-data=
*/
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
index 543bce9def..eeb5dd2582 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
@@ -2523,6 +2523,14 @@
   "id": "libvirt-36"
 }
 
+{
+    "id": "libvirt-37",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -2625,7 +2633,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }
 
 {
@@ -2706,21 +2714,21 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-39"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -3580,7 +3588,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
@@ -3602,7 +3610,7 @@
       "capability": "zero-blocks"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 6bd1dcfb99..c024b83895 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -146,7 +146,7 @@
   <flag name='isa-serial'/>
   <version>2001001</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>58992</microcodeVersion>
+  <microcodeVersion>59147</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
index 11171d5b3f..8fc07248c3 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
@@ -4948,6 +4948,14 @@
   "id": "libvirt-35"
 }
 
+{
+    "id": "libvirt-36",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -5212,7 +5220,7 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-37"
 }
 
 {
@@ -5378,12 +5386,6 @@
       "static": false
     }
   ],
-  "id": "libvirt-37"
-}
-
-{
-  "return": [
-  ],
   "id": "libvirt-38"
 }
 
@@ -5393,6 +5395,12 @@
   "id": "libvirt-39"
 }
 
+{
+  "return": [
+  ],
+  "id": "libvirt-40"
+}
+
 {
   "return": [
     {
@@ -6535,7 +6543,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -6585,7 +6593,7 @@
       "capability": "return-path"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
@@ -16308,7 +16316,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
@@ -16324,7 +16332,7 @@
       "kernel": true
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index ab1d635e64..09538221f1 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -169,7 +169,7 @@
   <flag name='qcow2-luks'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>303541</microcodeVersion>
+  <microcodeVersion>303696</microcodeVersion>
   <package> (v2.10.0)</package>
   <arch>aarch64</arch>
   <cpu type='kvm' name='pxa262'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
index 980f8ecc11..72dbc07c0e 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
@@ -5135,6 +5135,14 @@
   "id": "libvirt-36"
 }
 
+{
+    "id": "libvirt-37",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -5250,7 +5258,7 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }
 
 {
@@ -7426,12 +7434,6 @@
       "static": false
     }
   ],
-  "id": "libvirt-38"
-}
-
-{
-  "return": [
-  ],
   "id": "libvirt-39"
 }
 
@@ -7441,6 +7443,12 @@
   "id": "libvirt-40"
 }
 
+{
+  "return": [
+  ],
+  "id": "libvirt-41"
+}
+
 {
   "return": [
     {
@@ -8578,7 +8586,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
@@ -8628,7 +8636,7 @@
       "capability": "return-path"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
@@ -18351,7 +18359,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index d26d716452..793cb57349 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -168,7 +168,7 @@
   <flag name='qcow2-luks'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>382824</microcodeVersion>
+  <microcodeVersion>382979</microcodeVersion>
   <package> (v2.10.0)</package>
   <arch>ppc64</arch>
   <cpu type='kvm' name='default'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
index 534756f0b3..4e43cc44c6 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
@@ -3402,6 +3402,14 @@
   "id": "libvirt-33"
 }
 
+{
+    "id": "libvirt-34",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -3447,7 +3455,7 @@
       "cpu-max": 248
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-35"
 }
 
 {
@@ -3981,12 +3989,6 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-35"
-}
-
-{
-  "return": [
-  ],
   "id": "libvirt-36"
 }
 
@@ -3996,6 +3998,12 @@
   "id": "libvirt-37"
 }
 
+{
+  "return": [
+  ],
+  "id": "libvirt-38"
+}
+
 {
   "return": [
     {
@@ -5098,7 +5106,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-39"
 }
 
 {
@@ -5148,7 +5156,7 @@
       "capability": "return-path"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }
 
 {
@@ -14871,7 +14879,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -14911,11 +14919,11 @@
       }
     }
   },
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
-  "id": "libvirt-42",
+  "id": "libvirt-43",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index cfee4d1389..1d565afa19 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -129,7 +129,7 @@
   <flag name='qcow2-luks'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>303326</microcodeVersion>
+  <microcodeVersion>303481</microcodeVersion>
   <package></package>
   <arch>s390x</arch>
   <hostCPU type='kvm' model='z14-base' migratability='no'>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
index 6c6ecc2687..8606336fe2 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
@@ -4471,6 +4471,14 @@
   "id": "libvirt-39"
 }
 
+{
+    "id": "libvirt-40",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -4657,7 +4665,7 @@
       "alias": "q35"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -4992,21 +5000,21 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
@@ -6285,7 +6293,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -6335,7 +6343,7 @@
       "capability": "return-path"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -16058,185 +16066,6 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-46"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "cmov": true,
-        "ia64": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "pause-filter": false,
-        "xsavec": false,
-        "osxsave": false,
-        "kvm-asyncpf": true,
-        "perfctr-core": false,
-        "mpx": false,
-        "pbe": false,
-        "avx512cd": false,
-        "decodeassists": false,
-        "sse4.1": true,
-        "family": 6,
-        "avx512f": false,
-        "msr": true,
-        "mce": true,
-        "mca": true,
-        "xcrypt": false,
-        "min-level": 13,
-        "xgetbv1": false,
-        "cid": false,
-        "ds": false,
-        "fxsr": true,
-        "xsaveopt": true,
-        "xtpr": false,
-        "avx512vl": false,
-        "avx512-vpopcntdq": false,
-        "phe": false,
-        "extapic": false,
-        "3dnowprefetch": false,
-        "cr8legacy": false,
-        "xcrypt-en": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "GenuineIntel",
-        "pku": false,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": false,
-        "3dnowext": false,
-        "npt": false,
-        "clwb": false,
-        "lbrv": false,
-        "adx": false,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": false,
-        "pfthreshold": false,
-        "x2apic": true,
-        "avx512vbmi": false,
-        "flushbyasid": false,
-        "f16c": true,
-        "ace2-en": false,
-        "pae": true,
-        "pat": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm-nopiodelay": true,
-        "tm": false,
-        "kvmclock-stable-bit": true,
-        "hypervisor": true,
-        "pcommit": false,
-        "syscall": true,
-        "avx512dq": false,
-        "svm": false,
-        "invtsc": false,
-        "sse2": true,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": true,
-        "cx8": true,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "pdcm": false,
-        "model": 60,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": false,
-        "invpcid": true,
-        "pdpe1gb": true,
-        "tsc-deadline": true,
-        "fma": true,
-        "cx16": true,
-        "de": true,
-        "stepping": 3,
-        "xsave": true,
-        "clflush": true,
-        "skinit": false,
-        "tsc": true,
-        "tce": false,
-        "fpu": true,
-        "ds-cpl": false,
-        "ibs": false,
-        "fma4": false,
-        "la57": false,
-        "osvw": false,
-        "apic": true,
-        "pmm": false,
-        "tsc-adjust": true,
-        "kvm-steal-time": true,
-        "kvmclock": true,
-        "lwp": false,
-        "xop": false,
-        "avx": true,
-        "ospke": false,
-        "acpi": false,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": false,
-        "popcnt": true,
-        "xsaves": false,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": true,
-        "sep": true,
-        "nodeid-msr": false,
-        "misalignsse": false,
-        "min-xlevel": 2147483656,
-        "bmi1": true,
-        "bmi2": true,
-        "kvm-pv-unhalt": true,
-        "tsc-scale": false,
-        "topoext": false,
-        "clflushopt": false,
-        "monitor": false,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": true,
-        "3dnow": false,
-        "erms": true,
-        "lahf-lm": true,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": false,
-        "lmce": true,
-        "perfctr-nb": false,
-        "rdrand": true,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vme": true,
-        "vmx": true,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "tbm": false,
-        "wdt": false,
-        "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz",
-        "sha-ni": false,
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
   "id": "libvirt-47"
 }
 
@@ -16245,111 +16074,80 @@
     "model": {
       "name": "base",
       "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483656,
         "cmov": true,
         "ia64": false,
         "aes": true,
         "mmx": true,
-        "arat": true,
         "rdpid": false,
+        "arat": true,
         "pause-filter": false,
         "xsavec": false,
         "osxsave": false,
-        "tsc-frequency": 0,
-        "xd": true,
-        "hv-vendor-id": "",
         "kvm-asyncpf": true,
-        "kvm_asyncpf": true,
-        "perfctr_core": false,
         "perfctr-core": false,
         "mpx": false,
+        "pbe": false,
         "avx512cd": false,
         "decodeassists": false,
-        "pbe": false,
-        "sse4_1": true,
         "sse4.1": true,
-        "sse4-1": true,
         "family": 6,
-        "vmware-cpuid-freq": true,
         "avx512f": false,
-        "xcrypt": false,
-        "hv-runtime": false,
         "msr": true,
         "mce": true,
         "mca": true,
-        "thread-id": -1,
+        "xcrypt": false,
         "min-level": 13,
         "xgetbv1": false,
         "cid": false,
-        "hv-relaxed": false,
-        "fxsr": true,
         "ds": false,
-        "hv-crash": false,
+        "fxsr": true,
         "xsaveopt": true,
         "xtpr": false,
+        "avx512vl": false,
         "avx512-vpopcntdq": false,
         "phe": false,
-        "avx512vl": false,
         "extapic": false,
         "3dnowprefetch": false,
         "cr8legacy": false,
-        "cpuid-0xb": true,
         "xcrypt-en": false,
-        "kvm_pv_eoi": true,
-        "apic-id": 4294967295,
         "pn": false,
         "dca": false,
         "vendor": "GenuineIntel",
         "pku": false,
         "smx": false,
         "cmp-legacy": false,
-        "cmp_legacy": false,
-        "node-id": -1,
         "avx512-4fmaps": false,
         "vmcb-clean": false,
-        "vmcb_clean": false,
-        "3dnowext": false,
         "hle": false,
+        "3dnowext": false,
         "npt": false,
-        "memory": "/machine/unattached/system[0]",
         "clwb": false,
         "lbrv": false,
         "adx": false,
         "ss": true,
         "pni": true,
-        "svm_lock": false,
         "svm-lock": false,
         "smep": true,
-        "pfthreshold": false,
         "smap": false,
+        "pfthreshold": false,
         "x2apic": true,
         "avx512vbmi": false,
-        "hv-stimer": false,
-        "i64": true,
         "flushbyasid": false,
         "f16c": true,
         "ace2-en": false,
-        "pat": true,
         "pae": true,
+        "pat": true,
         "sse": true,
         "phe-en": false,
         "kvm-nopiodelay": true,
-        "kvm_nopiodelay": true,
         "tm": false,
         "kvmclock-stable-bit": true,
         "hypervisor": true,
-        "socket-id": -1,
         "pcommit": false,
         "syscall": true,
-        "level": 13,
         "avx512dq": false,
         "svm": false,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
         "invtsc": false,
-        "sse3": true,
         "sse2": true,
         "est": false,
         "avx512ifma": false,
@@ -16357,62 +16155,44 @@
         "kvm-pv-eoi": true,
         "cx8": true,
         "kvm-mmu": false,
-        "kvm_mmu": false,
-        "sse4_2": true,
         "sse4.2": true,
-        "sse4-2": true,
         "pge": true,
-        "fill-mtrr-mask": true,
         "pdcm": false,
-        "nodeid_msr": false,
         "model": 60,
         "movbe": true,
         "nrip-save": false,
-        "nrip_save": false,
-        "sse4a": false,
         "ssse3": true,
-        "kvm_pv_unhalt": true,
+        "sse4a": false,
         "invpcid": true,
         "pdpe1gb": true,
         "tsc-deadline": true,
         "fma": true,
         "cx16": true,
         "de": true,
-        "enforce": false,
         "stepping": 3,
         "xsave": true,
         "clflush": true,
         "skinit": false,
-        "tce": false,
         "tsc": true,
+        "tce": false,
         "fpu": true,
         "ds-cpl": false,
-        "ds_cpl": false,
         "ibs": false,
-        "host-phys-bits": false,
         "fma4": false,
         "la57": false,
         "osvw": false,
-        "check": true,
-        "hv-spinlocks": -1,
-        "pmm": false,
         "apic": true,
-        "pmu": false,
-        "min-xlevel2": 0,
+        "pmm": false,
         "tsc-adjust": true,
-        "tsc_adjust": true,
         "kvm-steal-time": true,
-        "kvm_steal_time": true,
         "kvmclock": true,
-        "l3-cache": true,
         "lwp": false,
         "xop": false,
         "avx": true,
         "ospke": false,
-        "ace2": false,
         "acpi": false,
         "avx512bw": false,
-        "hv-vapic": false,
+        "ace2": false,
         "fsgsbase": true,
         "ht": false,
         "nx": true,
@@ -16420,28 +16200,20 @@
         "mmxext": false,
         "popcnt": true,
         "xsaves": false,
-        "tcg-cpuid": true,
         "lm": true,
         "umip": false,
-        "avx2": true,
         "pse": true,
+        "avx2": true,
         "sep": true,
-        "pclmuldq": true,
         "nodeid-msr": false,
-        "kvm": true,
         "misalignsse": false,
         "min-xlevel": 2147483656,
-        "bmi2": true,
         "bmi1": true,
+        "bmi2": true,
         "kvm-pv-unhalt": true,
-        "realized": false,
-        "tsc_scale": false,
         "tsc-scale": false,
         "topoext": false,
-        "hv-vpindex": false,
-        "xlevel2": 0,
         "clflushopt": false,
-        "kvm-no-smi-migration": false,
         "monitor": false,
         "avx512er": false,
         "pmm-en": false,
@@ -16449,17 +16221,11 @@
         "3dnow": false,
         "erms": true,
         "lahf-lm": true,
-        "lahf_lm": true,
-        "xstore": false,
-        "hv-synic": false,
         "fxsr-opt": false,
-        "fxsr_opt": false,
+        "xstore": false,
         "rtm": false,
         "lmce": true,
-        "hv-time": false,
         "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
         "rdrand": true,
         "rdseed": false,
         "avx512-4vnniw": false,
@@ -16471,7 +16237,6 @@
         "pse36": true,
         "tbm": false,
         "wdt": false,
-        "pause_filter": false,
         "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz",
         "sha-ni": false,
         "abm": true,
@@ -16483,6 +16248,249 @@
   "id": "libvirt-48"
 }
 
+{
+  "return": {
+    "model": {
+      "name": "base",
+      "props": {
+        "phys-bits": 0,
+        "core-id": -1,
+        "xlevel": 2147483656,
+        "cmov": true,
+        "ia64": false,
+        "aes": true,
+        "mmx": true,
+        "arat": true,
+        "rdpid": false,
+        "pause-filter": false,
+        "xsavec": false,
+        "osxsave": false,
+        "tsc-frequency": 0,
+        "xd": true,
+        "hv-vendor-id": "",
+        "kvm-asyncpf": true,
+        "kvm_asyncpf": true,
+        "perfctr_core": false,
+        "perfctr-core": false,
+        "mpx": false,
+        "avx512cd": false,
+        "decodeassists": false,
+        "pbe": false,
+        "sse4_1": true,
+        "sse4.1": true,
+        "sse4-1": true,
+        "family": 6,
+        "vmware-cpuid-freq": true,
+        "avx512f": false,
+        "xcrypt": false,
+        "hv-runtime": false,
+        "msr": true,
+        "mce": true,
+        "mca": true,
+        "thread-id": -1,
+        "min-level": 13,
+        "xgetbv1": false,
+        "cid": false,
+        "hv-relaxed": false,
+        "fxsr": true,
+        "ds": false,
+        "hv-crash": false,
+        "xsaveopt": true,
+        "xtpr": false,
+        "avx512-vpopcntdq": false,
+        "phe": false,
+        "avx512vl": false,
+        "extapic": false,
+        "3dnowprefetch": false,
+        "cr8legacy": false,
+        "cpuid-0xb": true,
+        "xcrypt-en": false,
+        "kvm_pv_eoi": true,
+        "apic-id": 4294967295,
+        "pn": false,
+        "dca": false,
+        "vendor": "GenuineIntel",
+        "pku": false,
+        "smx": false,
+        "cmp-legacy": false,
+        "cmp_legacy": false,
+        "node-id": -1,
+        "avx512-4fmaps": false,
+        "vmcb-clean": false,
+        "vmcb_clean": false,
+        "3dnowext": false,
+        "hle": false,
+        "npt": false,
+        "memory": "/machine/unattached/system[0]",
+        "clwb": false,
+        "lbrv": false,
+        "adx": false,
+        "ss": true,
+        "pni": true,
+        "svm_lock": false,
+        "svm-lock": false,
+        "smep": true,
+        "pfthreshold": false,
+        "smap": false,
+        "x2apic": true,
+        "avx512vbmi": false,
+        "hv-stimer": false,
+        "i64": true,
+        "flushbyasid": false,
+        "f16c": true,
+        "ace2-en": false,
+        "pat": true,
+        "pae": true,
+        "sse": true,
+        "phe-en": false,
+        "kvm-nopiodelay": true,
+        "kvm_nopiodelay": true,
+        "tm": false,
+        "kvmclock-stable-bit": true,
+        "hypervisor": true,
+        "socket-id": -1,
+        "pcommit": false,
+        "syscall": true,
+        "level": 13,
+        "avx512dq": false,
+        "svm": false,
+        "full-cpuid-auto-level": true,
+        "hv-reset": false,
+        "invtsc": false,
+        "sse3": true,
+        "sse2": true,
+        "est": false,
+        "avx512ifma": false,
+        "tm2": false,
+        "kvm-pv-eoi": true,
+        "cx8": true,
+        "kvm-mmu": false,
+        "kvm_mmu": false,
+        "sse4_2": true,
+        "sse4.2": true,
+        "sse4-2": true,
+        "pge": true,
+        "fill-mtrr-mask": true,
+        "pdcm": false,
+        "nodeid_msr": false,
+        "model": 60,
+        "movbe": true,
+        "nrip-save": false,
+        "nrip_save": false,
+        "sse4a": false,
+        "ssse3": true,
+        "kvm_pv_unhalt": true,
+        "invpcid": true,
+        "pdpe1gb": true,
+        "tsc-deadline": true,
+        "fma": true,
+        "cx16": true,
+        "de": true,
+        "enforce": false,
+        "stepping": 3,
+        "xsave": true,
+        "clflush": true,
+        "skinit": false,
+        "tce": false,
+        "tsc": true,
+        "fpu": true,
+        "ds-cpl": false,
+        "ds_cpl": false,
+        "ibs": false,
+        "host-phys-bits": false,
+        "fma4": false,
+        "la57": false,
+        "osvw": false,
+        "check": true,
+        "hv-spinlocks": -1,
+        "pmm": false,
+        "apic": true,
+        "pmu": false,
+        "min-xlevel2": 0,
+        "tsc-adjust": true,
+        "tsc_adjust": true,
+        "kvm-steal-time": true,
+        "kvm_steal_time": true,
+        "kvmclock": true,
+        "l3-cache": true,
+        "lwp": false,
+        "xop": false,
+        "avx": true,
+        "ospke": false,
+        "ace2": false,
+        "acpi": false,
+        "avx512bw": false,
+        "hv-vapic": false,
+        "fsgsbase": true,
+        "ht": false,
+        "nx": true,
+        "pclmulqdq": true,
+        "mmxext": false,
+        "popcnt": true,
+        "xsaves": false,
+        "tcg-cpuid": true,
+        "lm": true,
+        "umip": false,
+        "avx2": true,
+        "pse": true,
+        "sep": true,
+        "pclmuldq": true,
+        "nodeid-msr": false,
+        "kvm": true,
+        "misalignsse": false,
+        "min-xlevel": 2147483656,
+        "bmi2": true,
+        "bmi1": true,
+        "kvm-pv-unhalt": true,
+        "realized": false,
+        "tsc_scale": false,
+        "tsc-scale": false,
+        "topoext": false,
+        "hv-vpindex": false,
+        "xlevel2": 0,
+        "clflushopt": false,
+        "kvm-no-smi-migration": false,
+        "monitor": false,
+        "avx512er": false,
+        "pmm-en": false,
+        "pcid": true,
+        "3dnow": false,
+        "erms": true,
+        "lahf-lm": true,
+        "lahf_lm": true,
+        "xstore": false,
+        "hv-synic": false,
+        "fxsr-opt": false,
+        "fxsr_opt": false,
+        "rtm": false,
+        "lmce": true,
+        "hv-time": false,
+        "perfctr-nb": false,
+        "perfctr_nb": false,
+        "ffxsr": false,
+        "rdrand": true,
+        "rdseed": false,
+        "avx512-4vnniw": false,
+        "vme": true,
+        "vmx": true,
+        "dtes64": false,
+        "mtrr": true,
+        "rdtscp": true,
+        "pse36": true,
+        "tbm": false,
+        "wdt": false,
+        "pause_filter": false,
+        "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz",
+        "sha-ni": false,
+        "abm": true,
+        "avx512pf": false,
+        "xstore-en": false
+      }
+    }
+  },
+  "id": "libvirt-49"
+}
+
 {
   "return": {
     "model": {
@@ -16659,7 +16667,7 @@
       }
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-50"
 }
 
 {
@@ -16902,7 +16910,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-51"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index bfd3b3c637..a2a8974659 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -212,7 +212,7 @@
   <flag name='qcow2-luks'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>344938</microcodeVersion>
+  <microcodeVersion>345093</microcodeVersion>
   <package> (v2.10.0)</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
index 2de256009e..ee64b5b81d 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
@@ -3521,6 +3521,14 @@
   "id": "libvirt-34"
 }
 
+{
+    "id": "libvirt-35",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -3571,7 +3579,7 @@
       "cpu-max": 248
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-36"
 }
 
 {
@@ -4105,20 +4113,20 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-37"
 }
 
 {
   "return": [
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }
 
 {
   "return": [
     "emulator"
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-39"
 }
 
 {
@@ -5239,7 +5247,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }
 
 {
@@ -5297,7 +5305,7 @@
       "capability": "x-multifd"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -15165,7 +15173,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
@@ -15204,11 +15212,11 @@
       }
     }
   },
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
-  "id": "libvirt-43",
+  "id": "libvirt-44",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 398a5a84cb..34734ac1ba 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -133,7 +133,7 @@
   <flag name='qcow2-luks'/>
   <version>2011000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>342058</microcodeVersion>
+  <microcodeVersion>342213</microcodeVersion>
   <package></package>
   <arch>s390x</arch>
   <hostCPU type='kvm' model='z14-base' migratability='no'>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
index 3512d88b67..0dd0c4eb04 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
@@ -5275,6 +5275,14 @@
   "id": "libvirt-35"
 }
 
+{
+    "id": "libvirt-36",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -5569,7 +5577,7 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-37"
 }
 
 {
@@ -5745,20 +5753,20 @@
       "static": false
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }
 
 {
   "return": [
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-39"
 }
 
 {
   "return": [
     "emulator"
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }
 
 {
@@ -6919,7 +6927,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -6981,7 +6989,7 @@
       "capability": "dirty-bitmaps"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
@@ -18349,7 +18357,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
@@ -18365,7 +18373,7 @@
       "kernel": false
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index c769b4b369..202a5492be 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -171,7 +171,7 @@
   <flag name='pcie-pci-bridge'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>342346</microcodeVersion>
+  <microcodeVersion>342501</microcodeVersion>
   <package>v2.12.0-rc0</package>
   <arch>aarch64</arch>
   <cpu type='kvm' name='pxa262'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
index 2166b34973..e1e8863f39 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
@@ -5322,6 +5322,14 @@
   "id": "libvirt-36"
 }
 
+{
+    "id": "libvirt-37",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -5457,7 +5465,7 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }
 
 {
@@ -7653,20 +7661,20 @@
       "static": false
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-39"
 }
 
 {
   "return": [
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }
 
 {
   "return": [
     "emulator"
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -8822,7 +8830,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
@@ -8884,7 +8892,7 @@
       "capability": "dirty-bitmaps"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
@@ -20252,7 +20260,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 0bdaef177c..d3c867c7e5 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -168,7 +168,7 @@
   <flag name='qcow2-luks'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>419215</microcodeVersion>
+  <microcodeVersion>419370</microcodeVersion>
   <package>v2.12.0-rc0</package>
   <arch>ppc64</arch>
   <cpu type='kvm' name='default'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
index c4e44c6d0f..3c1832800b 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
@@ -3614,6 +3614,14 @@
   "id": "libvirt-34"
 }
 
+{
+    "id": "libvirt-35",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -3669,7 +3677,7 @@
       "alias": "s390-ccw-virtio"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-36"
 }
 
 {
@@ -6324,20 +6332,20 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-37"
 }
 
 {
   "return": [
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }
 
 {
   "return": [
     "emulator"
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-39"
 }
 
 {
@@ -7493,7 +7501,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }
 
 {
@@ -7555,7 +7563,7 @@
       "capability": "dirty-bitmaps"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -18923,11 +18931,11 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
-  "id": "libvirt-42",
+  "id": "libvirt-43",
   "error": {
     "class": "GenericError",
     "desc": "The CPU definition 'max' is unknown."
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
index c086e04afd..c40046beef 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -4605,6 +4605,60 @@
   "id": "libvirt-39"
 }
 
+{
+  "return": [
+    {
+      "name": "policy",
+      "type": "HostMemPolicy"
+    },
+    {
+      "name": "dump",
+      "type": "bool"
+    },
+    {
+      "name": "share",
+      "type": "bool"
+    },
+    {
+      "name": "prealloc",
+      "type": "bool"
+    },
+    {
+      "name": "size",
+      "type": "int"
+    },
+    {
+      "name": "host-nodes",
+      "type": "int"
+    },
+    {
+      "name": "id",
+      "type": "string"
+    },
+    {
+      "name": "merge",
+      "type": "bool"
+    },
+    {
+      "name": "align",
+      "type": "int"
+    },
+    {
+      "name": "mem-path",
+      "type": "string"
+    },
+    {
+      "name": "discard-data",
+      "type": "bool"
+    },
+    {
+      "name": "type",
+      "type": "string"
+    }
+  ],
+  "id": "libvirt-40"
+}
+
 {
   "return": [
     {
@@ -4801,7 +4855,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -5315,7 +5369,7 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
@@ -5323,7 +5377,7 @@
     "tpm-crb",
     "tpm-tis"
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
@@ -5331,7 +5385,7 @@
     "passthrough",
     "emulator"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
@@ -6618,7 +6672,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -6680,7 +6734,7 @@
       "capability": "dirty-bitmaps"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -18048,196 +18102,6 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-46"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "cmov": true,
-        "ia64": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "pause-filter": false,
-        "xsavec": false,
-        "intel-pt": false,
-        "osxsave": false,
-        "kvm-asyncpf": true,
-        "perfctr-core": false,
-        "mpx": false,
-        "pbe": false,
-        "avx512cd": false,
-        "decodeassists": false,
-        "sse4.1": true,
-        "family": 6,
-        "avx512f": false,
-        "msr": true,
-        "mce": true,
-        "mca": true,
-        "xcrypt": false,
-        "min-level": 13,
-        "xgetbv1": false,
-        "cid": false,
-        "ds": false,
-        "fxsr": true,
-        "xsaveopt": true,
-        "xtpr": false,
-        "avx512vl": false,
-        "avx512-vpopcntdq": false,
-        "phe": false,
-        "extapic": false,
-        "3dnowprefetch": false,
-        "avx512vbmi2": false,
-        "cr8legacy": false,
-        "xcrypt-en": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "GenuineIntel",
-        "pku": false,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": false,
-        "3dnowext": false,
-        "npt": false,
-        "clwb": false,
-        "lbrv": false,
-        "adx": false,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": false,
-        "pfthreshold": false,
-        "x2apic": true,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "flushbyasid": false,
-        "f16c": true,
-        "ace2-en": false,
-        "pae": true,
-        "pat": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm-nopiodelay": true,
-        "tm": false,
-        "kvmclock-stable-bit": true,
-        "hypervisor": true,
-        "pcommit": false,
-        "syscall": true,
-        "avx512dq": false,
-        "svm": false,
-        "invtsc": false,
-        "sse2": true,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": true,
-        "cx8": true,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "avx512bitalg": false,
-        "pdcm": false,
-        "model": 63,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": false,
-        "invpcid": true,
-        "pdpe1gb": true,
-        "tsc-deadline": true,
-        "fma": true,
-        "cx16": true,
-        "de": true,
-        "stepping": 2,
-        "xsave": true,
-        "clflush": true,
-        "skinit": false,
-        "tsc": true,
-        "tce": false,
-        "fpu": true,
-        "ds-cpl": false,
-        "ibs": false,
-        "fma4": false,
-        "la57": false,
-        "osvw": false,
-        "apic": true,
-        "pmm": false,
-        "spec-ctrl": false,
-        "tsc-adjust": true,
-        "kvm-steal-time": true,
-        "kvmclock": true,
-        "lwp": false,
-        "xop": false,
-        "ibpb": false,
-        "avx": true,
-        "ospke": false,
-        "acpi": false,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": false,
-        "popcnt": true,
-        "vaes": false,
-        "xsaves": false,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": true,
-        "sep": true,
-        "nodeid-msr": false,
-        "misalignsse": false,
-        "min-xlevel": 2147483656,
-        "bmi1": true,
-        "bmi2": true,
-        "kvm-pv-unhalt": true,
-        "tsc-scale": false,
-        "topoext": false,
-        "clflushopt": false,
-        "monitor": false,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": true,
-        "3dnow": false,
-        "erms": true,
-        "lahf-lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": false,
-        "kvm-hint-dedicated": true,
-        "lmce": true,
-        "perfctr-nb": false,
-        "rdrand": true,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vme": true,
-        "vmx": false,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": false,
-        "tbm": false,
-        "wdt": false,
-        "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
-        "sha-ni": false,
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
   "id": "libvirt-47"
 }
 
@@ -18246,9 +18110,6 @@
     "model": {
       "name": "base",
       "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483656,
         "cmov": true,
         "ia64": false,
         "aes": true,
@@ -18260,34 +18121,22 @@
         "xsavec": false,
         "intel-pt": false,
         "osxsave": false,
-        "tsc-frequency": 0,
-        "xd": true,
-        "hv-vendor-id": "",
         "kvm-asyncpf": true,
-        "kvm_asyncpf": true,
-        "perfctr_core": false,
         "perfctr-core": false,
         "mpx": false,
         "pbe": false,
-        "decodeassists": false,
         "avx512cd": false,
-        "sse4_1": true,
+        "decodeassists": false,
         "sse4.1": true,
-        "sse4-1": true,
         "family": 6,
-        "vmware-cpuid-freq": true,
         "avx512f": false,
         "msr": true,
         "mce": true,
         "mca": true,
-        "hv-runtime": false,
         "xcrypt": false,
-        "thread-id": -1,
         "min-level": 13,
         "xgetbv1": false,
         "cid": false,
-        "hv-relaxed": false,
-        "hv-crash": false,
         "ds": false,
         "fxsr": true,
         "xsaveopt": true,
@@ -18299,83 +18148,60 @@
         "3dnowprefetch": false,
         "avx512vbmi2": false,
         "cr8legacy": false,
-        "cpuid-0xb": true,
         "xcrypt-en": false,
-        "kvm_pv_eoi": true,
-        "apic-id": 4294967295,
         "pn": false,
         "dca": false,
         "vendor": "GenuineIntel",
         "pku": false,
         "smx": false,
-        "cmp_legacy": false,
         "cmp-legacy": false,
-        "node-id": -1,
         "avx512-4fmaps": false,
-        "vmcb_clean": false,
         "vmcb-clean": false,
-        "3dnowext": false,
         "hle": false,
+        "3dnowext": false,
         "npt": false,
-        "memory": "/machine/unattached/system[0]",
         "clwb": false,
         "lbrv": false,
         "adx": false,
         "ss": true,
         "pni": true,
-        "svm_lock": false,
         "svm-lock": false,
-        "pfthreshold": false,
         "smep": true,
         "smap": false,
+        "pfthreshold": false,
         "x2apic": true,
         "avx512vbmi": false,
         "avx512vnni": false,
-        "hv-stimer": false,
-        "i64": true,
         "flushbyasid": false,
         "f16c": true,
         "ace2-en": false,
-        "pat": true,
         "pae": true,
+        "pat": true,
         "sse": true,
         "phe-en": false,
-        "kvm_nopiodelay": true,
         "kvm-nopiodelay": true,
         "tm": false,
         "kvmclock-stable-bit": true,
         "hypervisor": true,
-        "socket-id": -1,
         "pcommit": false,
         "syscall": true,
-        "level": 13,
         "avx512dq": false,
         "svm": false,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
         "invtsc": false,
-        "sse3": true,
         "sse2": true,
         "est": false,
         "avx512ifma": false,
         "tm2": false,
         "kvm-pv-eoi": true,
         "cx8": true,
-        "kvm_mmu": false,
         "kvm-mmu": false,
-        "sse4_2": true,
         "sse4.2": true,
-        "sse4-2": true,
         "pge": true,
-        "fill-mtrr-mask": true,
         "avx512bitalg": false,
-        "nodeid_msr": false,
         "pdcm": false,
-        "movbe": true,
         "model": 63,
-        "nrip_save": false,
+        "movbe": true,
         "nrip-save": false,
-        "kvm_pv_unhalt": true,
         "ssse3": true,
         "sse4a": false,
         "invpcid": true,
@@ -18384,7 +18210,6 @@
         "fma": true,
         "cx16": true,
         "de": true,
-        "enforce": false,
         "stepping": 2,
         "xsave": true,
         "clflush": true,
@@ -18392,66 +18217,47 @@
         "tsc": true,
         "tce": false,
         "fpu": true,
-        "ibs": false,
-        "ds_cpl": false,
         "ds-cpl": false,
-        "host-phys-bits": false,
+        "ibs": false,
         "fma4": false,
         "la57": false,
         "osvw": false,
-        "check": true,
-        "hv-spinlocks": -1,
-        "pmu": false,
-        "pmm": false,
         "apic": true,
+        "pmm": false,
         "spec-ctrl": false,
-        "min-xlevel2": 0,
         "tsc-adjust": true,
-        "tsc_adjust": true,
         "kvm-steal-time": true,
-        "kvm_steal_time": true,
         "kvmclock": true,
-        "l3-cache": true,
         "lwp": false,
-        "ibpb": false,
         "xop": false,
+        "ibpb": false,
         "avx": true,
         "ospke": false,
-        "ace2": false,
-        "avx512bw": false,
         "acpi": false,
-        "hv-vapic": false,
+        "avx512bw": false,
+        "ace2": false,
         "fsgsbase": true,
         "ht": false,
         "nx": true,
         "pclmulqdq": true,
         "mmxext": false,
-        "vaes": false,
         "popcnt": true,
+        "vaes": false,
         "xsaves": false,
-        "tcg-cpuid": true,
         "lm": true,
         "umip": false,
         "pse": true,
         "avx2": true,
         "sep": true,
-        "pclmuldq": true,
-        "x-hv-max-vps": -1,
         "nodeid-msr": false,
-        "kvm": true,
         "misalignsse": false,
         "min-xlevel": 2147483656,
-        "kvm-pv-unhalt": true,
-        "bmi2": true,
         "bmi1": true,
-        "realized": false,
-        "tsc_scale": false,
+        "bmi2": true,
+        "kvm-pv-unhalt": true,
         "tsc-scale": false,
         "topoext": false,
-        "hv-vpindex": false,
-        "xlevel2": 0,
         "clflushopt": false,
-        "kvm-no-smi-migration": false,
         "monitor": false,
         "avx512er": false,
         "pmm-en": false,
@@ -18459,24 +18265,18 @@
         "3dnow": false,
         "erms": true,
         "lahf-lm": true,
-        "lahf_lm": true,
         "vpclmulqdq": false,
         "fxsr-opt": false,
-        "hv-synic": false,
         "xstore": false,
-        "fxsr_opt": false,
-        "kvm-hint-dedicated": true,
         "rtm": false,
+        "kvm-hint-dedicated": true,
         "lmce": true,
-        "hv-time": false,
         "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
         "rdrand": true,
         "rdseed": false,
         "avx512-4vnniw": false,
-        "vmx": false,
         "vme": true,
+        "vmx": false,
         "dtes64": false,
         "mtrr": true,
         "rdtscp": true,
@@ -18484,9 +18284,8 @@
         "kvm-pv-tlb-flush": false,
         "tbm": false,
         "wdt": false,
-        "pause_filter": false,
-        "sha-ni": false,
         "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
+        "sha-ni": false,
         "abm": true,
         "avx512pf": false,
         "xstore-en": false
@@ -18496,6 +18295,261 @@
   "id": "libvirt-48"
 }
 
+{
+  "return": {
+    "model": {
+      "name": "base",
+      "props": {
+        "phys-bits": 0,
+        "core-id": -1,
+        "xlevel": 2147483656,
+        "cmov": true,
+        "ia64": false,
+        "aes": true,
+        "mmx": true,
+        "rdpid": false,
+        "arat": true,
+        "gfni": false,
+        "pause-filter": false,
+        "xsavec": false,
+        "intel-pt": false,
+        "osxsave": false,
+        "tsc-frequency": 0,
+        "xd": true,
+        "hv-vendor-id": "",
+        "kvm-asyncpf": true,
+        "kvm_asyncpf": true,
+        "perfctr_core": false,
+        "perfctr-core": false,
+        "mpx": false,
+        "pbe": false,
+        "decodeassists": false,
+        "avx512cd": false,
+        "sse4_1": true,
+        "sse4.1": true,
+        "sse4-1": true,
+        "family": 6,
+        "vmware-cpuid-freq": true,
+        "avx512f": false,
+        "msr": true,
+        "mce": true,
+        "mca": true,
+        "hv-runtime": false,
+        "xcrypt": false,
+        "thread-id": -1,
+        "min-level": 13,
+        "xgetbv1": false,
+        "cid": false,
+        "hv-relaxed": false,
+        "hv-crash": false,
+        "ds": false,
+        "fxsr": true,
+        "xsaveopt": true,
+        "xtpr": false,
+        "avx512vl": false,
+        "avx512-vpopcntdq": false,
+        "phe": false,
+        "extapic": false,
+        "3dnowprefetch": false,
+        "avx512vbmi2": false,
+        "cr8legacy": false,
+        "cpuid-0xb": true,
+        "xcrypt-en": false,
+        "kvm_pv_eoi": true,
+        "apic-id": 4294967295,
+        "pn": false,
+        "dca": false,
+        "vendor": "GenuineIntel",
+        "pku": false,
+        "smx": false,
+        "cmp_legacy": false,
+        "cmp-legacy": false,
+        "node-id": -1,
+        "avx512-4fmaps": false,
+        "vmcb_clean": false,
+        "vmcb-clean": false,
+        "3dnowext": false,
+        "hle": false,
+        "npt": false,
+        "memory": "/machine/unattached/system[0]",
+        "clwb": false,
+        "lbrv": false,
+        "adx": false,
+        "ss": true,
+        "pni": true,
+        "svm_lock": false,
+        "svm-lock": false,
+        "pfthreshold": false,
+        "smep": true,
+        "smap": false,
+        "x2apic": true,
+        "avx512vbmi": false,
+        "avx512vnni": false,
+        "hv-stimer": false,
+        "i64": true,
+        "flushbyasid": false,
+        "f16c": true,
+        "ace2-en": false,
+        "pat": true,
+        "pae": true,
+        "sse": true,
+        "phe-en": false,
+        "kvm_nopiodelay": true,
+        "kvm-nopiodelay": true,
+        "tm": false,
+        "kvmclock-stable-bit": true,
+        "hypervisor": true,
+        "socket-id": -1,
+        "pcommit": false,
+        "syscall": true,
+        "level": 13,
+        "avx512dq": false,
+        "svm": false,
+        "full-cpuid-auto-level": true,
+        "hv-reset": false,
+        "invtsc": false,
+        "sse3": true,
+        "sse2": true,
+        "est": false,
+        "avx512ifma": false,
+        "tm2": false,
+        "kvm-pv-eoi": true,
+        "cx8": true,
+        "kvm_mmu": false,
+        "kvm-mmu": false,
+        "sse4_2": true,
+        "sse4.2": true,
+        "sse4-2": true,
+        "pge": true,
+        "fill-mtrr-mask": true,
+        "avx512bitalg": false,
+        "nodeid_msr": false,
+        "pdcm": false,
+        "movbe": true,
+        "model": 63,
+        "nrip_save": false,
+        "nrip-save": false,
+        "kvm_pv_unhalt": true,
+        "ssse3": true,
+        "sse4a": false,
+        "invpcid": true,
+        "pdpe1gb": true,
+        "tsc-deadline": true,
+        "fma": true,
+        "cx16": true,
+        "de": true,
+        "enforce": false,
+        "stepping": 2,
+        "xsave": true,
+        "clflush": true,
+        "skinit": false,
+        "tsc": true,
+        "tce": false,
+        "fpu": true,
+        "ibs": false,
+        "ds_cpl": false,
+        "ds-cpl": false,
+        "host-phys-bits": false,
+        "fma4": false,
+        "la57": false,
+        "osvw": false,
+        "check": true,
+        "hv-spinlocks": -1,
+        "pmu": false,
+        "pmm": false,
+        "apic": true,
+        "spec-ctrl": false,
+        "min-xlevel2": 0,
+        "tsc-adjust": true,
+        "tsc_adjust": true,
+        "kvm-steal-time": true,
+        "kvm_steal_time": true,
+        "kvmclock": true,
+        "l3-cache": true,
+        "lwp": false,
+        "ibpb": false,
+        "xop": false,
+        "avx": true,
+        "ospke": false,
+        "ace2": false,
+        "avx512bw": false,
+        "acpi": false,
+        "hv-vapic": false,
+        "fsgsbase": true,
+        "ht": false,
+        "nx": true,
+        "pclmulqdq": true,
+        "mmxext": false,
+        "vaes": false,
+        "popcnt": true,
+        "xsaves": false,
+        "tcg-cpuid": true,
+        "lm": true,
+        "umip": false,
+        "pse": true,
+        "avx2": true,
+        "sep": true,
+        "pclmuldq": true,
+        "x-hv-max-vps": -1,
+        "nodeid-msr": false,
+        "kvm": true,
+        "misalignsse": false,
+        "min-xlevel": 2147483656,
+        "kvm-pv-unhalt": true,
+        "bmi2": true,
+        "bmi1": true,
+        "realized": false,
+        "tsc_scale": false,
+        "tsc-scale": false,
+        "topoext": false,
+        "hv-vpindex": false,
+        "xlevel2": 0,
+        "clflushopt": false,
+        "kvm-no-smi-migration": false,
+        "monitor": false,
+        "avx512er": false,
+        "pmm-en": false,
+        "pcid": true,
+        "3dnow": false,
+        "erms": true,
+        "lahf-lm": true,
+        "lahf_lm": true,
+        "vpclmulqdq": false,
+        "fxsr-opt": false,
+        "hv-synic": false,
+        "xstore": false,
+        "fxsr_opt": false,
+        "kvm-hint-dedicated": true,
+        "rtm": false,
+        "lmce": true,
+        "hv-time": false,
+        "perfctr-nb": false,
+        "perfctr_nb": false,
+        "ffxsr": false,
+        "rdrand": true,
+        "rdseed": false,
+        "avx512-4vnniw": false,
+        "vmx": false,
+        "vme": true,
+        "dtes64": false,
+        "mtrr": true,
+        "rdtscp": true,
+        "pse36": true,
+        "kvm-pv-tlb-flush": false,
+        "tbm": false,
+        "wdt": false,
+        "pause_filter": false,
+        "sha-ni": false,
+        "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
+        "abm": true,
+        "avx512pf": false,
+        "xstore-en": false
+      }
+    }
+  },
+  "id": "libvirt-49"
+}
+
 {
   "return": {
     "model": {
@@ -18683,7 +18737,7 @@
       }
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-50"
 }
 
 {
@@ -18938,7 +18992,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-51"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index f71b37cee2..e8986f1645 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -207,9 +207,10 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
+  <flag name='memory-backend-file.discard-data'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>390060</microcodeVersion>
+  <microcodeVersion>390813</microcodeVersion>
   <package>v2.12.0-rc0</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
index 68ecb0c17d..b11dcc4421 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
@@ -3114,6 +3114,14 @@
   "id": "libvirt-39"
 }
 
+{
+    "id": "libvirt-40",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -3240,7 +3248,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -3330,21 +3338,21 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
@@ -4352,7 +4360,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -4382,7 +4390,7 @@
       "capability": "events"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 8e7c2a5daf..37538898e9 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -171,7 +171,7 @@
   <flag name='isa-serial'/>
   <version>2004000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>75406</microcodeVersion>
+  <microcodeVersion>75561</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
index 5bc505abb3..e2012d0e3b 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
@@ -3277,6 +3277,14 @@
   "id": "libvirt-39"
 }
 
+{
+    "id": "libvirt-40",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -3411,7 +3419,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -3501,21 +3509,21 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
@@ -4560,7 +4568,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -4594,7 +4602,7 @@
       "capability": "x-postcopy-ram"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -12139,7 +12147,7 @@
       "meta-type": "array"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-47"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 223d0a7a3c..ca18f146db 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -177,7 +177,7 @@
   <flag name='isa-serial'/>
   <version>2005000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>216528</microcodeVersion>
+  <microcodeVersion>216683</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
index 0ec7193b09..b3aecdcf5a 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
@@ -3619,6 +3619,14 @@
   "id": "libvirt-35"
 }
 
+{
+    "id": "libvirt-36",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -3791,7 +3799,7 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-37"
 }
 
 {
@@ -3890,12 +3898,6 @@
       "name": "pxa270"
     }
   ],
-  "id": "libvirt-37"
-}
-
-{
-  "return": [
-  ],
   "id": "libvirt-38"
 }
 
@@ -3905,6 +3907,12 @@
   "id": "libvirt-39"
 }
 
+{
+  "return": [
+  ],
+  "id": "libvirt-40"
+}
+
 {
   "return": [
     {
@@ -4874,7 +4882,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -4908,7 +4916,7 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
@@ -12913,7 +12921,7 @@
       "meta-type": "array"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
@@ -12929,7 +12937,7 @@
       "kernel": true
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 46c006b805..294253df55 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -157,7 +157,7 @@
   <flag name='dump-completed'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>228241</microcodeVersion>
+  <microcodeVersion>228396</microcodeVersion>
   <package></package>
   <arch>aarch64</arch>
   <cpu type='kvm' name='pxa262'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
index d4a893bb4d..5eddbbab71 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
@@ -3815,6 +3815,14 @@
   "id": "libvirt-36"
 }
 
+{
+    "id": "libvirt-37",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -3884,7 +3892,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }
 
 {
@@ -5186,12 +5194,6 @@
       "name": "MPC8541E_v11"
     }
   ],
-  "id": "libvirt-38"
-}
-
-{
-  "return": [
-  ],
   "id": "libvirt-39"
 }
 
@@ -5201,6 +5203,12 @@
   "id": "libvirt-40"
 }
 
+{
+  "return": [
+  ],
+  "id": "libvirt-41"
+}
+
 {
   "return": [
     {
@@ -6165,7 +6173,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
@@ -6199,7 +6207,7 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
@@ -14204,7 +14212,7 @@
       "meta-type": "array"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index 6c7799924d..e3b072d382 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -152,7 +152,7 @@
   <flag name='dump-completed'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>263005</microcodeVersion>
+  <microcodeVersion>263160</microcodeVersion>
   <package></package>
   <arch>ppc64</arch>
   <cpu type='kvm' name='default'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
index 73a22ed0bb..c4cc9fdb7a 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
@@ -3359,6 +3359,14 @@
   "id": "libvirt-39"
 }
 
+{
+    "id": "libvirt-40",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -3469,7 +3477,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -3559,21 +3567,21 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
@@ -4667,7 +4675,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -4701,7 +4709,7 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -12706,7 +12714,7 @@
       "meta-type": "array"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-47"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 720e84b47e..8bd4705d4c 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -188,7 +188,7 @@
   <flag name='dump-completed'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>227332</microcodeVersion>
+  <microcodeVersion>227487</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
index 61fbd9a667..a8491bed7a 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
@@ -2547,6 +2547,14 @@
   "id": "libvirt-33"
 }
 
+{
+    "id": "libvirt-34",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -2577,7 +2585,7 @@
       "cpu-max": 248
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-35"
 }
 
 {
@@ -2586,12 +2594,6 @@
       "name": "host"
     }
   ],
-  "id": "libvirt-35"
-}
-
-{
-  "return": [
-  ],
   "id": "libvirt-36"
 }
 
@@ -2601,6 +2603,12 @@
   "id": "libvirt-37"
 }
 
+{
+  "return": [
+  ],
+  "id": "libvirt-38"
+}
+
 {
   "return": [
     {
@@ -3534,7 +3542,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-39"
 }
 
 {
@@ -3568,7 +3576,7 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }
 
 {
@@ -11924,7 +11932,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 8e2e796b28..78842832d3 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -119,7 +119,7 @@
   <flag name='dump-completed'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>216732</microcodeVersion>
+  <microcodeVersion>216887</microcodeVersion>
   <package></package>
   <arch>s390x</arch>
   <cpu type='kvm' name='host'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
index eaa84d3381..2a34dc5ca8 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
@@ -3554,6 +3554,14 @@
   "id": "libvirt-39"
 }
 
+{
+    "id": "libvirt-40",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -3700,7 +3708,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -3793,21 +3801,21 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
@@ -4905,7 +4913,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -4939,7 +4947,7 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -13295,7 +13303,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-47"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index c900360c07..901d9fe812 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -192,7 +192,7 @@
   <flag name='dump-completed'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>239029</microcodeVersion>
+  <microcodeVersion>239184</microcodeVersion>
   <package> (v2.7.0)</package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
index 818118caf2..f9bb30e734 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
@@ -2820,6 +2820,14 @@
   "id": "libvirt-33"
 }
 
+{
+    "id": "libvirt-34",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -2855,7 +2863,7 @@
       "alias": "s390-ccw-virtio"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-35"
 }
 
 {
@@ -3181,12 +3189,6 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-35"
-}
-
-{
-  "return": [
-  ],
   "id": "libvirt-36"
 }
 
@@ -3196,6 +3198,12 @@
   "id": "libvirt-37"
 }
 
+{
+  "return": [
+  ],
+  "id": "libvirt-38"
+}
+
 {
   "return": [
     {
@@ -4154,7 +4162,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-39"
 }
 
 {
@@ -4192,7 +4200,7 @@
       "capability": "x-colo"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }
 
 {
@@ -12962,7 +12970,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -12988,11 +12996,11 @@
       }
     }
   },
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
-  "id": "libvirt-42",
+  "id": "libvirt-43",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 44957621b5..dcc442af3a 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -121,7 +121,7 @@
   <flag name='dump-completed'/>
   <version>2007093</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>241633</microcodeVersion>
+  <microcodeVersion>241788</microcodeVersion>
   <package></package>
   <arch>s390x</arch>
   <hostCPU type='kvm' model='zEC12.2-base'
migratability='no'>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
index 30d28c7b5f..965848eff2 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
@@ -3696,6 +3696,14 @@
   "id": "libvirt-39"
 }
 
+{
+    "id": "libvirt-40",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -3862,7 +3870,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -4068,21 +4076,21 @@
       "static": false
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
@@ -5205,7 +5213,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -5243,7 +5251,7 @@
       "capability": "x-colo"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -14013,7 +14021,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-47"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index a32a10cfb2..932667d5a6 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -194,7 +194,7 @@
   <flag name='dump-completed'/>
   <version>2008000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>255684</microcodeVersion>
+  <microcodeVersion>255839</microcodeVersion>
   <package> (v2.8.0)</package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='host' usable='yes'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
index f367da8d2b..2783fa3673 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
@@ -4317,6 +4317,14 @@
   "id": "libvirt-36"
 }
 
+{
+    "id": "libvirt-37",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -4427,7 +4435,7 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }
 
 {
@@ -6603,12 +6611,6 @@
       "static": false
     }
   ],
-  "id": "libvirt-38"
-}
-
-{
-  "return": [
-  ],
   "id": "libvirt-39"
 }
 
@@ -6618,6 +6620,12 @@
   "id": "libvirt-40"
 }
 
+{
+  "return": [
+  ],
+  "id": "libvirt-41"
+}
+
 {
   "return": [
     {
@@ -7725,7 +7733,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
@@ -7767,7 +7775,7 @@
       "capability": "release-ram"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
@@ -17053,7 +17061,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index db61974e6b..9f30086d4a 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -160,7 +160,7 @@
   <flag name='dump-completed'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>346538</microcodeVersion>
+  <microcodeVersion>346693</microcodeVersion>
   <package> (v2.9.0)</package>
   <arch>ppc64</arch>
   <cpu type='kvm' name='default'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
index cbacec6d02..d59fafd776 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
@@ -3101,6 +3101,14 @@
   "id": "libvirt-33"
 }
 
+{
+    "id": "libvirt-34",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -3141,7 +3149,7 @@
       "cpu-max": 248
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-35"
 }
 
 {
@@ -3531,12 +3539,6 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-35"
-}
-
-{
-  "return": [
-  ],
   "id": "libvirt-36"
 }
 
@@ -3546,6 +3548,12 @@
   "id": "libvirt-37"
 }
 
+{
+  "return": [
+  ],
+  "id": "libvirt-38"
+}
+
 {
   "return": [
     {
@@ -4618,7 +4626,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-39"
 }
 
 {
@@ -4660,7 +4668,7 @@
       "capability": "release-ram"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }
 
 {
@@ -13946,7 +13954,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -13973,11 +13981,11 @@
       }
     }
   },
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
-  "id": "libvirt-42",
+  "id": "libvirt-43",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index da8b39dc20..260892ed03 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -124,7 +124,7 @@
   <flag name='dump-completed'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>265051</microcodeVersion>
+  <microcodeVersion>265206</microcodeVersion>
   <package></package>
   <arch>s390x</arch>
   <hostCPU type='kvm' model='z13.2-base'
migratability='no'>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
index 5da1b41c2e..287b754425 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
@@ -4015,6 +4015,14 @@
   "id": "libvirt-39"
 }
 
+{
+    "id": "libvirt-40",
+    "error": {
+        "class": "CommandNotFound",
+        "desc": "The command qom-list-properties has not been found"
+    }
+}
+
 {
   "return": [
     {
@@ -4191,7 +4199,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -4473,21 +4481,21 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
@@ -5736,7 +5744,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -5778,7 +5786,7 @@
       "capability": "release-ram"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -15064,185 +15072,6 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-46"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "cmov": true,
-        "ia64": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "pause-filter": false,
-        "xsavec": true,
-        "osxsave": false,
-        "kvm-asyncpf": true,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "avx512cd": false,
-        "decodeassists": false,
-        "sse4.1": true,
-        "family": 6,
-        "avx512f": false,
-        "msr": true,
-        "mce": true,
-        "mca": true,
-        "xcrypt": false,
-        "min-level": 13,
-        "xgetbv1": true,
-        "cid": false,
-        "ds": false,
-        "fxsr": true,
-        "xsaveopt": true,
-        "xtpr": false,
-        "avx512vl": false,
-        "avx512-vpopcntdq": false,
-        "phe": false,
-        "extapic": false,
-        "3dnowprefetch": true,
-        "cr8legacy": false,
-        "xcrypt-en": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "GenuineIntel",
-        "pku": false,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": true,
-        "3dnowext": false,
-        "npt": false,
-        "clwb": false,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": true,
-        "pfthreshold": false,
-        "x2apic": true,
-        "avx512vbmi": false,
-        "flushbyasid": false,
-        "f16c": true,
-        "ace2-en": false,
-        "pae": true,
-        "pat": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm-nopiodelay": true,
-        "tm": false,
-        "kvmclock-stable-bit": true,
-        "hypervisor": true,
-        "pcommit": false,
-        "syscall": true,
-        "avx512dq": false,
-        "svm": false,
-        "invtsc": false,
-        "sse2": true,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": true,
-        "cx8": true,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "pdcm": false,
-        "model": 94,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": false,
-        "invpcid": true,
-        "pdpe1gb": true,
-        "tsc-deadline": true,
-        "fma": true,
-        "cx16": true,
-        "de": true,
-        "stepping": 3,
-        "xsave": true,
-        "clflush": true,
-        "skinit": false,
-        "tsc": true,
-        "tce": false,
-        "fpu": true,
-        "ds-cpl": false,
-        "ibs": false,
-        "fma4": false,
-        "la57": false,
-        "osvw": false,
-        "apic": true,
-        "pmm": false,
-        "tsc-adjust": true,
-        "kvm-steal-time": true,
-        "kvmclock": true,
-        "lwp": false,
-        "xop": false,
-        "avx": true,
-        "ospke": false,
-        "acpi": false,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": false,
-        "popcnt": true,
-        "xsaves": true,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": true,
-        "sep": true,
-        "nodeid-msr": false,
-        "misalignsse": false,
-        "min-xlevel": 2147483656,
-        "bmi1": true,
-        "bmi2": true,
-        "kvm-pv-unhalt": true,
-        "tsc-scale": false,
-        "topoext": false,
-        "clflushopt": true,
-        "monitor": false,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": true,
-        "3dnow": false,
-        "erms": true,
-        "lahf-lm": true,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": true,
-        "lmce": true,
-        "perfctr-nb": false,
-        "rdrand": true,
-        "rdseed": true,
-        "avx512-4vnniw": false,
-        "vme": true,
-        "vmx": true,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "tbm": false,
-        "wdt": false,
-        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-        "sha-ni": false,
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
   "id": "libvirt-47"
 }
 
@@ -15251,110 +15080,80 @@
     "model": {
       "name": "base",
       "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483656,
         "cmov": true,
         "ia64": false,
         "aes": true,
         "mmx": true,
-        "arat": true,
         "rdpid": false,
+        "arat": true,
         "pause-filter": false,
         "xsavec": true,
         "osxsave": false,
-        "tsc-frequency": 0,
-        "xd": true,
-        "hv-vendor-id": "",
         "kvm-asyncpf": true,
-        "kvm_asyncpf": true,
-        "perfctr_core": false,
         "perfctr-core": false,
         "mpx": true,
+        "pbe": false,
         "avx512cd": false,
         "decodeassists": false,
-        "pbe": false,
-        "sse4_1": true,
         "sse4.1": true,
-        "sse4-1": true,
         "family": 6,
-        "vmware-cpuid-freq": true,
         "avx512f": false,
-        "xcrypt": false,
-        "hv-runtime": false,
         "msr": true,
         "mce": true,
         "mca": true,
-        "thread-id": -1,
+        "xcrypt": false,
         "min-level": 13,
         "xgetbv1": true,
         "cid": false,
-        "hv-relaxed": false,
-        "fxsr": true,
         "ds": false,
-        "hv-crash": false,
+        "fxsr": true,
         "xsaveopt": true,
         "xtpr": false,
+        "avx512vl": false,
         "avx512-vpopcntdq": false,
         "phe": false,
-        "avx512vl": false,
         "extapic": false,
         "3dnowprefetch": true,
         "cr8legacy": false,
-        "cpuid-0xb": true,
         "xcrypt-en": false,
-        "kvm_pv_eoi": true,
-        "apic-id": 4294967295,
         "pn": false,
         "dca": false,
         "vendor": "GenuineIntel",
         "pku": false,
         "smx": false,
         "cmp-legacy": false,
-        "cmp_legacy": false,
         "avx512-4fmaps": false,
         "vmcb-clean": false,
-        "vmcb_clean": false,
-        "3dnowext": false,
         "hle": true,
+        "3dnowext": false,
         "npt": false,
-        "memory": "/machine/unattached/system[0]",
         "clwb": false,
         "lbrv": false,
         "adx": true,
         "ss": true,
         "pni": true,
-        "svm_lock": false,
         "svm-lock": false,
         "smep": true,
-        "pfthreshold": false,
         "smap": true,
+        "pfthreshold": false,
         "x2apic": true,
         "avx512vbmi": false,
-        "hv-stimer": false,
-        "i64": true,
         "flushbyasid": false,
         "f16c": true,
         "ace2-en": false,
-        "pat": true,
         "pae": true,
+        "pat": true,
         "sse": true,
         "phe-en": false,
         "kvm-nopiodelay": true,
-        "kvm_nopiodelay": true,
         "tm": false,
         "kvmclock-stable-bit": true,
         "hypervisor": true,
-        "socket-id": -1,
         "pcommit": false,
         "syscall": true,
-        "level": 13,
         "avx512dq": false,
         "svm": false,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
         "invtsc": false,
-        "sse3": true,
         "sse2": true,
         "est": false,
         "avx512ifma": false,
@@ -15362,62 +15161,44 @@
         "kvm-pv-eoi": true,
         "cx8": true,
         "kvm-mmu": false,
-        "kvm_mmu": false,
-        "sse4_2": true,
         "sse4.2": true,
-        "sse4-2": true,
         "pge": true,
-        "fill-mtrr-mask": true,
         "pdcm": false,
-        "nodeid_msr": false,
         "model": 94,
         "movbe": true,
         "nrip-save": false,
-        "nrip_save": false,
-        "sse4a": false,
         "ssse3": true,
-        "kvm_pv_unhalt": true,
+        "sse4a": false,
         "invpcid": true,
         "pdpe1gb": true,
         "tsc-deadline": true,
         "fma": true,
         "cx16": true,
         "de": true,
-        "enforce": false,
         "stepping": 3,
         "xsave": true,
         "clflush": true,
         "skinit": false,
-        "tce": false,
         "tsc": true,
+        "tce": false,
         "fpu": true,
         "ds-cpl": false,
-        "ds_cpl": false,
         "ibs": false,
-        "host-phys-bits": false,
         "fma4": false,
         "la57": false,
         "osvw": false,
-        "check": true,
-        "hv-spinlocks": -1,
-        "pmm": false,
         "apic": true,
-        "pmu": false,
-        "min-xlevel2": 0,
+        "pmm": false,
         "tsc-adjust": true,
-        "tsc_adjust": true,
         "kvm-steal-time": true,
-        "kvm_steal_time": true,
         "kvmclock": true,
-        "l3-cache": true,
         "lwp": false,
         "xop": false,
         "avx": true,
         "ospke": false,
-        "ace2": false,
         "acpi": false,
         "avx512bw": false,
-        "hv-vapic": false,
+        "ace2": false,
         "fsgsbase": true,
         "ht": false,
         "nx": true,
@@ -15427,25 +15208,18 @@
         "xsaves": true,
         "lm": true,
         "umip": false,
-        "avx2": true,
         "pse": true,
+        "avx2": true,
         "sep": true,
-        "pclmuldq": true,
         "nodeid-msr": false,
-        "kvm": true,
         "misalignsse": false,
         "min-xlevel": 2147483656,
-        "bmi2": true,
         "bmi1": true,
+        "bmi2": true,
         "kvm-pv-unhalt": true,
-        "realized": false,
-        "tsc_scale": false,
         "tsc-scale": false,
         "topoext": false,
-        "hv-vpindex": false,
-        "xlevel2": 0,
         "clflushopt": true,
-        "kvm-no-smi-migration": false,
         "monitor": false,
         "avx512er": false,
         "pmm-en": false,
@@ -15453,17 +15227,11 @@
         "3dnow": false,
         "erms": true,
         "lahf-lm": true,
-        "lahf_lm": true,
-        "xstore": false,
-        "hv-synic": false,
         "fxsr-opt": false,
-        "fxsr_opt": false,
+        "xstore": false,
         "rtm": true,
         "lmce": true,
-        "hv-time": false,
         "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
         "rdrand": true,
         "rdseed": true,
         "avx512-4vnniw": false,
@@ -15475,7 +15243,6 @@
         "pse36": true,
         "tbm": false,
         "wdt": false,
-        "pause_filter": false,
         "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
         "sha-ni": false,
         "abm": true,
@@ -15487,6 +15254,247 @@
   "id": "libvirt-48"
 }
 
+{
+  "return": {
+    "model": {
+      "name": "base",
+      "props": {
+        "phys-bits": 0,
+        "core-id": -1,
+        "xlevel": 2147483656,
+        "cmov": true,
+        "ia64": false,
+        "aes": true,
+        "mmx": true,
+        "arat": true,
+        "rdpid": false,
+        "pause-filter": false,
+        "xsavec": true,
+        "osxsave": false,
+        "tsc-frequency": 0,
+        "xd": true,
+        "hv-vendor-id": "",
+        "kvm-asyncpf": true,
+        "kvm_asyncpf": true,
+        "perfctr_core": false,
+        "perfctr-core": false,
+        "mpx": true,
+        "avx512cd": false,
+        "decodeassists": false,
+        "pbe": false,
+        "sse4_1": true,
+        "sse4.1": true,
+        "sse4-1": true,
+        "family": 6,
+        "vmware-cpuid-freq": true,
+        "avx512f": false,
+        "xcrypt": false,
+        "hv-runtime": false,
+        "msr": true,
+        "mce": true,
+        "mca": true,
+        "thread-id": -1,
+        "min-level": 13,
+        "xgetbv1": true,
+        "cid": false,
+        "hv-relaxed": false,
+        "fxsr": true,
+        "ds": false,
+        "hv-crash": false,
+        "xsaveopt": true,
+        "xtpr": false,
+        "avx512-vpopcntdq": false,
+        "phe": false,
+        "avx512vl": false,
+        "extapic": false,
+        "3dnowprefetch": true,
+        "cr8legacy": false,
+        "cpuid-0xb": true,
+        "xcrypt-en": false,
+        "kvm_pv_eoi": true,
+        "apic-id": 4294967295,
+        "pn": false,
+        "dca": false,
+        "vendor": "GenuineIntel",
+        "pku": false,
+        "smx": false,
+        "cmp-legacy": false,
+        "cmp_legacy": false,
+        "avx512-4fmaps": false,
+        "vmcb-clean": false,
+        "vmcb_clean": false,
+        "3dnowext": false,
+        "hle": true,
+        "npt": false,
+        "memory": "/machine/unattached/system[0]",
+        "clwb": false,
+        "lbrv": false,
+        "adx": true,
+        "ss": true,
+        "pni": true,
+        "svm_lock": false,
+        "svm-lock": false,
+        "smep": true,
+        "pfthreshold": false,
+        "smap": true,
+        "x2apic": true,
+        "avx512vbmi": false,
+        "hv-stimer": false,
+        "i64": true,
+        "flushbyasid": false,
+        "f16c": true,
+        "ace2-en": false,
+        "pat": true,
+        "pae": true,
+        "sse": true,
+        "phe-en": false,
+        "kvm-nopiodelay": true,
+        "kvm_nopiodelay": true,
+        "tm": false,
+        "kvmclock-stable-bit": true,
+        "hypervisor": true,
+        "socket-id": -1,
+        "pcommit": false,
+        "syscall": true,
+        "level": 13,
+        "avx512dq": false,
+        "svm": false,
+        "full-cpuid-auto-level": true,
+        "hv-reset": false,
+        "invtsc": false,
+        "sse3": true,
+        "sse2": true,
+        "est": false,
+        "avx512ifma": false,
+        "tm2": false,
+        "kvm-pv-eoi": true,
+        "cx8": true,
+        "kvm-mmu": false,
+        "kvm_mmu": false,
+        "sse4_2": true,
+        "sse4.2": true,
+        "sse4-2": true,
+        "pge": true,
+        "fill-mtrr-mask": true,
+        "pdcm": false,
+        "nodeid_msr": false,
+        "model": 94,
+        "movbe": true,
+        "nrip-save": false,
+        "nrip_save": false,
+        "sse4a": false,
+        "ssse3": true,
+        "kvm_pv_unhalt": true,
+        "invpcid": true,
+        "pdpe1gb": true,
+        "tsc-deadline": true,
+        "fma": true,
+        "cx16": true,
+        "de": true,
+        "enforce": false,
+        "stepping": 3,
+        "xsave": true,
+        "clflush": true,
+        "skinit": false,
+        "tce": false,
+        "tsc": true,
+        "fpu": true,
+        "ds-cpl": false,
+        "ds_cpl": false,
+        "ibs": false,
+        "host-phys-bits": false,
+        "fma4": false,
+        "la57": false,
+        "osvw": false,
+        "check": true,
+        "hv-spinlocks": -1,
+        "pmm": false,
+        "apic": true,
+        "pmu": false,
+        "min-xlevel2": 0,
+        "tsc-adjust": true,
+        "tsc_adjust": true,
+        "kvm-steal-time": true,
+        "kvm_steal_time": true,
+        "kvmclock": true,
+        "l3-cache": true,
+        "lwp": false,
+        "xop": false,
+        "avx": true,
+        "ospke": false,
+        "ace2": false,
+        "acpi": false,
+        "avx512bw": false,
+        "hv-vapic": false,
+        "fsgsbase": true,
+        "ht": false,
+        "nx": true,
+        "pclmulqdq": true,
+        "mmxext": false,
+        "popcnt": true,
+        "xsaves": true,
+        "lm": true,
+        "umip": false,
+        "avx2": true,
+        "pse": true,
+        "sep": true,
+        "pclmuldq": true,
+        "nodeid-msr": false,
+        "kvm": true,
+        "misalignsse": false,
+        "min-xlevel": 2147483656,
+        "bmi2": true,
+        "bmi1": true,
+        "kvm-pv-unhalt": true,
+        "realized": false,
+        "tsc_scale": false,
+        "tsc-scale": false,
+        "topoext": false,
+        "hv-vpindex": false,
+        "xlevel2": 0,
+        "clflushopt": true,
+        "kvm-no-smi-migration": false,
+        "monitor": false,
+        "avx512er": false,
+        "pmm-en": false,
+        "pcid": true,
+        "3dnow": false,
+        "erms": true,
+        "lahf-lm": true,
+        "lahf_lm": true,
+        "xstore": false,
+        "hv-synic": false,
+        "fxsr-opt": false,
+        "fxsr_opt": false,
+        "rtm": true,
+        "lmce": true,
+        "hv-time": false,
+        "perfctr-nb": false,
+        "perfctr_nb": false,
+        "ffxsr": false,
+        "rdrand": true,
+        "rdseed": true,
+        "avx512-4vnniw": false,
+        "vme": true,
+        "vmx": true,
+        "dtes64": false,
+        "mtrr": true,
+        "rdtscp": true,
+        "pse36": true,
+        "tbm": false,
+        "wdt": false,
+        "pause_filter": false,
+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
+        "sha-ni": false,
+        "abm": true,
+        "avx512pf": false,
+        "xstore-en": false
+      }
+    }
+  },
+  "id": "libvirt-49"
+}
+
 {
   "return": {
     "model": {
@@ -15663,7 +15671,7 @@
       }
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-50"
 }
 
 {
@@ -15904,7 +15912,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-51"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 5697923c3e..d7dde697b1 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -207,7 +207,7 @@
   <flag name='dump-completed'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>320947</microcodeVersion>
+  <microcodeVersion>321102</microcodeVersion>
   <package> (v2.9.0)</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
-- 
2.16.1


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

[libvirt] [PATCH v2 4/5] qemu_capabilities: Introduce QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD