qemu: Add capability flag for setting the extended tseg size

For getting the reply I queried the newest and oldest QEMU using
test/qemucapsprobe.  From the differences I only extracted the reply to the new
QMP command and discarded the rest.  For all the versions below the one which
added support for the new option I used the output from the oldest QEMU release
and for those that support it I used the output from the newest one.

In order to make doubly sure the reply is where it is supposed to be (the
replies files are very forgiving) I added the property to all the replies files,
reran the tests again and fixed the order in replies files so that all the
versions are reporting the new capability.  Then removed that one property.

After that I used test/qemucapsfixreplies to fix the reply IDs.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

src/qemu/qemu_capabilities.c

@@ -495,6 +495,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "vhost-vsock",
               "chardev-fd-pass",
               "tpm-emulator",
+              "mch",
+              "mch.extended-tseg-mbytes",
     );
 
 
@@ -1132,6 +1134,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
     { "hda-output", QEMU_CAPS_HDA_OUTPUT },
     { "vmgenid", QEMU_CAPS_DEVICE_VMGENID },
     { "vhost-vsock-device", QEMU_CAPS_DEVICE_VHOST_VSOCK },
+    { "mch", QEMU_CAPS_DEVICE_MCH },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
@@ -1277,6 +1280,10 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtualCSSBridge[] =
     { "cssid-unrestricted", QEMU_CAPS_CCW_CSSID_UNRESTRICTED },
 };
 
+static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsMCH[] = {
+    { "extended-tseg-mbytes", QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES },
+};
+
 /* see documentation for virQEMUQAPISchemaPathGet for the query format */
 static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "blockdev-add/arg-type/options/+gluster/debug-level", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
@@ -1406,6 +1413,9 @@ static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] = {
     { "virtual-css-bridge", virQEMUCapsObjectPropsVirtualCSSBridge,
       ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtualCSSBridge),
       QEMU_CAPS_CCW },
+    { "mch", virQEMUCapsDevicePropsMCH,
+      ARRAY_CARDINALITY(virQEMUCapsDevicePropsMCH),
+      QEMU_CAPS_DEVICE_MCH },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendFile[] = {

src/qemu/qemu_capabilities.h

@@ -479,6 +479,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_DEVICE_VHOST_VSOCK, /* -device vhost-vsock-* */
     QEMU_CAPS_CHARDEV_FD_PASS, /* Passing pre-opened FDs for chardevs */
     QEMU_CAPS_DEVICE_TPM_EMULATOR, /* -tpmdev emulator */
+    QEMU_CAPS_DEVICE_MCH, /* Northbridge in q35 machine types */
+    QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES, /* -global mch.extended-tseg-mbytes */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;

tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies

@@ -2044,6 +2044,32 @@
   "id": "libvirt-36"
 }
 
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    }
+  ],
+  "id": "libvirt-37"
+}
+
 {
   "return": [
     {
@@ -2114,7 +2140,7 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }
 
 {
@@ -2192,12 +2218,6 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-38"
-}
-
-{
-  "return": [
-  ],
   "id": "libvirt-39"
 }
 
@@ -2207,6 +2227,12 @@
   "id": "libvirt-40"
 }
 
+{
+  "return": [
+  ],
+  "id": "libvirt-41"
+}
+
 {
   "return": [
     {
@@ -2905,7 +2931,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
@@ -2915,7 +2941,7 @@
       "capability": "xbzrle"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {

tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml

@@ -107,9 +107,10 @@
   <flag name='kernel-irqchip'/>
   <flag name='isa-serial'/>
   <flag name='hda-output'/>
+  <flag name='mch'/>
   <version>1005003</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>46523</microcodeVersion>
+  <microcodeVersion>46889</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>

tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies

@@ -2089,6 +2089,32 @@
   "id": "libvirt-36"
 }
 
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    }
+  ],
+  "id": "libvirt-37"
+}
+
 {
   "return": [
     {
@@ -2167,7 +2193,7 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }
 
 {
@@ -2245,12 +2271,6 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-38"
-}
-
-{
-  "return": [
-  ],
   "id": "libvirt-39"
 }
 
@@ -2260,6 +2280,12 @@
   "id": "libvirt-40"
 }
 
+{
+  "return": [
+  ],
+  "id": "libvirt-41"
+}
+
 {
   "return": [
     {
@@ -2860,7 +2886,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
@@ -2882,7 +2908,7 @@
       "capability": "zero-blocks"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {

tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml

@@ -112,9 +112,10 @@
   <flag name='kernel-irqchip'/>
   <flag name='isa-serial'/>
   <flag name='hda-output'/>
+  <flag name='mch'/>
   <version>1006000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>44752</microcodeVersion>
+  <microcodeVersion>45118</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>

tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies

@@ -2106,6 +2106,32 @@
   "id": "libvirt-36"
 }
 
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    }
+  ],
+  "id": "libvirt-37"
+}
+
 {
   "return": [
     {
@@ -2192,7 +2218,7 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }
 
 {
@@ -2270,12 +2296,6 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-38"
-}
-
-{
-  "return": [
-  ],
   "id": "libvirt-39"
 }
 
@@ -2285,6 +2305,12 @@
   "id": "libvirt-40"
 }
 
+{
+  "return": [
+  ],
+  "id": "libvirt-41"
+}
+
 {
   "return": [
     {
@@ -3075,7 +3101,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
@@ -3097,7 +3123,7 @@
       "capability": "zero-blocks"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {

tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml

@@ -114,9 +114,10 @@
   <flag name='kernel-irqchip'/>
   <flag name='isa-serial'/>
   <flag name='hda-output'/>
+  <flag name='mch'/>
   <version>1007000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>50196</microcodeVersion>
+  <microcodeVersion>50562</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>

tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies

@@ -2523,6 +2523,32 @@
   "id": "libvirt-36"
 }
 
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    }
+  ],
+  "id": "libvirt-37"
+}
+
 {
   "return": [
     {
@@ -2625,7 +2651,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }
 
 {
@@ -2706,21 +2732,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 +3606,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
@@ -3602,7 +3628,7 @@
       "capability": "zero-blocks"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {

tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml

@@ -130,9 +130,10 @@
   <flag name='kernel-irqchip'/>
   <flag name='isa-serial'/>
   <flag name='hda-output'/>
+  <flag name='mch'/>
   <version>2001001</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>58992</microcodeVersion>
+  <microcodeVersion>59358</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>

tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies

@@ -4471,6 +4471,32 @@
   "id": "libvirt-39"
 }
 
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    }
+  ],
+  "id": "libvirt-40"
+}
+
 {
   "return": [
     {
@@ -4657,7 +4683,7 @@
       "alias": "q35"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -4992,21 +5018,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 +6311,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -6335,7 +6361,7 @@
       "capability": "return-path"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -16058,185 +16084,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 +16092,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 +16173,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,
+        "pmm": 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,
+        "ace2": false,
         "fsgsbase": true,
         "ht": false,
         "nx": true,
@@ -16420,28 +16218,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 +16239,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 +16255,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 +16266,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 +16685,7 @@
       }
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-50"
 }
 
 {
@@ -16902,7 +16928,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-51"
 }
 
 {

tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml

@@ -202,9 +202,10 @@
   <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
+  <flag name='mch'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>344938</microcodeVersion>
+  <microcodeVersion>345304</microcodeVersion>
   <package> (v2.10.0)</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>

tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies

@@ -4605,6 +4605,49 @@
   "id": "libvirt-39"
 }
 
+{
+  "return": [
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "x-pcie-lnksta-dllla",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "multifunction",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "extended-tseg-mbytes",
+      "type": "uint16"
+    },
+    {
+      "name": "romfile",
+      "type": "str"
+    },
+    {
+      "name": "x-pcie-extcap-init",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "command_serr_enable",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "addr",
+      "description": "Slot and optional function number, example: 06.0 or 06",
+      "type": "int32"
+    }
+  ],
+  "id": "libvirt-40"
+}
+
 {
   "return": [
     {
@@ -4656,7 +4699,7 @@
       "type": "string"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -4855,7 +4898,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
@@ -5369,7 +5412,7 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
@@ -5377,7 +5420,7 @@
     "tpm-crb",
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
@@ -5385,7 +5428,7 @@
     "passthrough",
     "emulator"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -6672,7 +6715,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -6734,7 +6777,7 @@
       "capability": "dirty-bitmaps"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-47"
 }
 
 {
@@ -18102,196 +18145,6 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-47"
-}
-
-{
-  "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-48"
 }
 
@@ -18300,9 +18153,6 @@
     "model": {
       "name": "base",
       "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483656,
         "cmov": true,
         "ia64": false,
         "aes": true,
@@ -18314,34 +18164,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,
@@ -18353,83 +18191,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,
@@ -18438,7 +18253,6 @@
         "fma": true,
         "cx16": true,
         "de": true,
-        "enforce": false,
         "stepping": 2,
         "xsave": true,
         "clflush": true,
@@ -18446,66 +18260,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,
+        "bmi2": true,
-        "tsc_scale": false,
+        "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,
@@ -18513,24 +18308,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,
@@ -18538,9 +18327,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
@@ -18550,6 +18338,261 @@
   "id": "libvirt-49"
 }
 
+{
+  "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-50"
+}
+
 {
   "return": {
     "model": {
@@ -18737,7 +18780,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-51"
 }
 
 {
@@ -18992,7 +19035,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {

tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml

@@ -208,9 +208,11 @@
   <flag name='vhost-vsock'/>
   <flag name='chardev-fd-pass'/>
   <flag name='tpm-emulator'/>
+  <flag name='mch'/>
+  <flag name='mch.extended-tseg-mbytes'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>390813</microcodeVersion>
+  <microcodeVersion>391586</microcodeVersion>
   <package>v2.12.0-rc0</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>

tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies

@@ -3114,6 +3114,32 @@
   "id": "libvirt-39"
 }
 
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    }
+  ],
+  "id": "libvirt-40"
+}
+
 {
   "return": [
     {
@@ -3240,7 +3266,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -3330,21 +3356,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 +4378,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -4382,7 +4408,7 @@
       "capability": "events"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {

tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml

@@ -156,9 +156,10 @@
   <flag name='isa-serial'/>
   <flag name='sdl-gl'/>
   <flag name='hda-output'/>
+  <flag name='mch'/>
   <version>2004000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>75406</microcodeVersion>
+  <microcodeVersion>75772</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>

tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies

@@ -3277,6 +3277,32 @@
   "id": "libvirt-39"
 }
 
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    }
+  ],
+  "id": "libvirt-40"
+}
+
 {
   "return": [
     {
@@ -3411,7 +3437,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -3501,21 +3527,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 +4586,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -4594,7 +4620,7 @@
       "capability": "x-postcopy-ram"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -12139,7 +12165,7 @@
       "meta-type": "array"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-47"
 }
 
 {

tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml

@@ -162,9 +162,10 @@
   <flag name='isa-serial'/>
   <flag name='sdl-gl'/>
   <flag name='hda-output'/>
+  <flag name='mch'/>
   <version>2005000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>216528</microcodeVersion>
+  <microcodeVersion>216894</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>

tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies

@@ -3359,6 +3359,32 @@
   "id": "libvirt-39"
 }
 
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    }
+  ],
+  "id": "libvirt-40"
+}
+
 {
   "return": [
     {
@@ -3469,7 +3495,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -3559,21 +3585,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 +4693,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -4701,7 +4727,7 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -12706,7 +12732,7 @@
       "meta-type": "array"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-47"
 }
 
 {

tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml

@@ -174,9 +174,10 @@
   <flag name='nbd-tls'/>
   <flag name='sdl-gl'/>
   <flag name='hda-output'/>
+  <flag name='mch'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>227332</microcodeVersion>
+  <microcodeVersion>227698</microcodeVersion>
   <package></package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>

tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies

@@ -3554,6 +3554,32 @@
   "id": "libvirt-39"
 }
 
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    }
+  ],
+  "id": "libvirt-40"
+}
+
 {
   "return": [
     {
@@ -3700,7 +3726,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -3793,21 +3819,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 +4931,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -4939,7 +4965,7 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -13295,7 +13321,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-47"
 }
 
 {

tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml

@@ -179,9 +179,10 @@
   <flag name='nbd-tls'/>
   <flag name='sdl-gl'/>
   <flag name='hda-output'/>
+  <flag name='mch'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>239029</microcodeVersion>
+  <microcodeVersion>239395</microcodeVersion>
   <package> (v2.7.0)</package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='Opteron_G5'/>

tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies

@@ -3696,6 +3696,32 @@
   "id": "libvirt-39"
 }
 
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    }
+  ],
+  "id": "libvirt-40"
+}
+
 {
   "return": [
     {
@@ -3862,7 +3888,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -4068,21 +4094,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 +5231,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -5243,7 +5269,7 @@
       "capability": "x-colo"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -14013,7 +14039,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-47"
 }
 
 {

tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml

@@ -182,9 +182,10 @@
   <flag name='sdl-gl'/>
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>
+  <flag name='mch'/>
   <version>2008000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>255684</microcodeVersion>
+  <microcodeVersion>256050</microcodeVersion>
   <package> (v2.8.0)</package>
   <arch>x86_64</arch>
   <cpu type='kvm' name='host' usable='yes'/>

tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies

@@ -4015,6 +4015,32 @@
   "id": "libvirt-39"
 }
 
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    }
+  ],
+  "id": "libvirt-40"
+}
+
 {
   "return": [
     {
@@ -4191,7 +4217,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -4473,21 +4499,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 +5762,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -5778,7 +5804,7 @@
       "capability": "release-ram"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -15064,185 +15090,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 +15098,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 +15179,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,
+        "pmm": 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,
+        "ace2": false,
         "fsgsbase": true,
         "ht": false,
         "nx": true,
@@ -15427,25 +15226,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 +15245,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 +15261,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 +15272,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 +15689,7 @@
       }
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-50"
 }
 
 {
@@ -15904,7 +15930,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-51"
 }
 
 {

tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml

@@ -197,9 +197,10 @@
   <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
+  <flag name='mch'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>320947</microcodeVersion>
+  <microcodeVersion>321313</microcodeVersion>
   <package> (v2.9.0)</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>