[libvirt PATCH v3 6/6] qemu: drop support for full CPU model expansion

Daniel P. Berrangé posted 6 patches 1 month, 2 weeks ago

[libvirt PATCH v3 6/6] qemu: drop support for full CPU model expansion

Posted by Daniel P. Berrangé 1 month, 2 weeks ago
The "canonical CPU features" capability is a derivative of the
"unavailable features" capability, which is exposed when seeing
the "max" CPU models has the "unavailable-features" property.

This property was actually added back in QEMU version 2.8.0 per
the QAPI schema

  @unavailable-features: List of properties that prevent
                         the CPU model from running in the current
                         host. (since 2.8)

so given our minimum QEMU version 2.11 there is no need to
query this.

XXX strangely when we stop querying this, the domain
capabilities data for CPUs changes significantly for QEMU
versions less than 4.1.0. This suggests this code was masking
a need for some other capability check that would trigger for
QEMU < 4.1.0 ?

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 src/qemu/qemu_capabilities.c                  |   12 +-
 src/qemu/qemu_monitor.h                       |    1 -
 src/qemu/qemu_monitor_json.c                  |   15 -
 .../caps_2.11.0.x86_64.replies                | 2564 ++----------
 .../caps_2.11.0.x86_64.xml                    |  182 +-
 .../caps_2.12.0.x86_64.replies                | 3036 +++------------
 .../caps_2.12.0.x86_64.xml                    |  194 +-
 .../caps_3.0.0.x86_64.replies                 | 3130 ++++-----------
 .../caps_3.0.0.x86_64.xml                     |  204 +-
 .../caps_3.1.0.x86_64.replies                 | 3436 ++++------------
 .../caps_3.1.0.x86_64.xml                     |  218 +-
 .../caps_4.0.0.x86_64.replies                 | 3452 ++++-------------
 .../caps_4.0.0.x86_64.xml                     |  226 +-
 13 files changed, 3382 insertions(+), 13288 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 6a0188257a..9b6f523d04 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3002,17 +3002,7 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps,
 
     cpu->model = g_strdup(model);
 
-    /* Some x86_64 features defined in src/cpu_map/ use spelling which differ
-     * from the one preferred by QEMU. Static expansion would give us only the
-     * preferred spelling. With new QEMU we always use the QEMU's canonical
-     * names of all features and translate between them and our names. But for
-     * older version of QEMU we need to do a full expansion on the result of
-     * the initial static expansion to get all variants of feature names.
-     */
-    if (ARCH_IS_X86(qemuCaps->arch) &&
-        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CANONICAL_CPU_FEATURES)) {
-        type = QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC_FULL;
-    } else if (ARCH_IS_ARM(qemuCaps->arch)) {
+    if (ARCH_IS_ARM(qemuCaps->arch)) {
         type = QEMU_MONITOR_CPU_MODEL_EXPANSION_FULL;
     } else {
         type = QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC;
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 648fe293ed..0e225abd78 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1264,7 +1264,6 @@ struct _qemuMonitorCPUModelInfo {
 
 typedef enum {
     QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC,
-    QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC_FULL,
     QEMU_MONITOR_CPU_MODEL_EXPANSION_FULL,
 } qemuMonitorCPUModelExpansionType;
 
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 1b98baa4c7..eef64768cb 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -5962,10 +5962,8 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitor *mon,
     if (!(model = qemuMonitorJSONMakeCPUModel(cpu, migratable)))
         return -1;
 
- retry:
     switch (type) {
     case QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC:
-    case QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC_FULL:
         typeStr = "static";
         break;
 
@@ -6000,19 +5998,6 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitor *mon,
                                          &cpu_name) < 0)
         return -1;
 
-    /* QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC_FULL requests "full" expansion
-     * on the result of the initial "static" expansion.
-     */
-    if (type == QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC_FULL) {
-        if (!(model = virJSONValueCopy(cpu_model)))
-            return -1;
-
-        virJSONValueFree(cmd);
-        virJSONValueFree(reply);
-        type = QEMU_MONITOR_CPU_MODEL_EXPANSION_FULL;
-        goto retry;
-    }
-
     return qemuMonitorJSONParseCPUModel(cpu_name, cpu_props, model_info);
 }
 
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
index 8c72203f2c..08ba3e26c9 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
@@ -16638,7 +16638,19 @@
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
-    "type": "full",
+    "type": "static",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false
+      }
+    }
+  },
+  "id": "libvirt-44"
+}
+
+{
+  "return": {
     "model": {
       "name": "base",
       "props": {
@@ -16715,7 +16727,7 @@
         "syscall": true,
         "avx512dq": false,
         "svm": false,
-        "invtsc": false,
+        "invtsc": true,
         "sse2": true,
         "est": false,
         "avx512ifma": false,
@@ -16817,1896 +16829,412 @@
   "id": "libvirt-44"
 }
 
+{
+  "execute": "qmp_capabilities",
+  "id": "libvirt-1"
+}
+
 {
   "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,
-        "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,
-        "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": true,
-        "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": 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,
-        "node-id": -1,
-        "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,
-        "pfthreshold": false,
-        "smep": true,
-        "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,
-        "nodeid_msr": false,
-        "pdcm": false,
-        "movbe": true,
-        "model": 94,
-        "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": 3,
-        "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,
-        "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,
-        "avx512bw": false,
-        "acpi": false,
-        "hv-vapic": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": false,
-        "popcnt": true,
-        "xsaves": true,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": true,
-        "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": 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,
-        "fxsr-opt": false,
-        "hv-synic": false,
-        "xstore": 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,
-        "vmx": true,
-        "vme": true,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": true,
-        "tbm": false,
-        "wdt": false,
-        "pause_filter": false,
-        "sha-ni": false,
-        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
   },
-  "id": "libvirt-44"
+  "id": "libvirt-1"
 }
 
 {
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "host",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-45"
+  "execute": "query-cpu-definitions",
+  "id": "libvirt-2"
 }
 
 {
-  "return": {
-    "model": {
+  "return": [
+    {
+      "name": "max",
+      "typename": "max-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": false
+    },
+    {
+      "name": "host",
+      "typename": "host-x86_64-cpu",
+      "unavailable-features": [
+        "kvm"
+      ],
+      "static": false,
+      "migration-safe": false
+    },
+    {
       "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": true,
-        "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": true,
-        "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,
-        "kvm-pv-tlb-flush": 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-45"
-}
-
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "full",
-    "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": true,
-        "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": true,
-        "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,
-        "kvm-pv-tlb-flush": 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-46"
-}
-
-{
-  "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,
-        "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,
-        "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": true,
-        "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": 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,
-        "node-id": -1,
-        "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,
-        "pfthreshold": false,
-        "smep": true,
-        "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": true,
-        "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,
-        "nodeid_msr": false,
-        "pdcm": false,
-        "movbe": true,
-        "model": 94,
-        "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": 3,
-        "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,
-        "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,
-        "avx512bw": false,
-        "acpi": false,
-        "hv-vapic": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": false,
-        "popcnt": true,
-        "xsaves": true,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": true,
-        "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": 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,
-        "fxsr-opt": false,
-        "hv-synic": false,
-        "xstore": 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,
-        "vmx": true,
-        "vme": true,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": true,
-        "tbm": false,
-        "wdt": false,
-        "pause_filter": false,
-        "sha-ni": false,
-        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-46"
-}
-
-{
-  "execute": "qmp_capabilities",
-  "id": "libvirt-1"
-}
-
-{
-  "return": {
-  },
-  "id": "libvirt-1"
-}
-
-{
-  "execute": "query-cpu-definitions",
-  "id": "libvirt-2"
-}
-
-{
-  "return": [
-    {
-      "name": "max",
-      "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": false
-    },
-    {
-      "name": "host",
-      "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-        "kvm"
-      ],
-      "static": false,
-      "migration-safe": false
-    },
-    {
-      "name": "base",
-      "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": true,
-      "migration-safe": true
-    },
-    {
-      "name": "qemu64",
-      "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "qemu32",
-      "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "phenom",
-      "typename": "phenom-x86_64-cpu",
-      "unavailable-features": [
-        "fxsr-opt",
-        "npt"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "pentium3",
-      "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "pentium2",
-      "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "pentium",
-      "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "n270",
-      "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "kvm64",
-      "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "kvm32",
-      "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "coreduo",
-      "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "core2duo",
-      "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "athlon",
-      "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Westmere",
-      "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Server",
-      "typename": "Skylake-Server-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "avx512f",
-        "avx512dq",
-        "rdseed",
-        "avx512cd",
-        "avx512bw",
-        "avx512vl",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Client",
-      "typename": "Skylake-Client-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "SandyBridge",
-      "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Penryn",
-      "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G5",
-      "typename": "Opteron_G5-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "avx",
-        "f16c",
-        "misalignsse",
-        "3dnowprefetch",
-        "xop",
-        "fma4",
-        "tbm"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G4",
-      "typename": "Opteron_G4-x86_64-cpu",
-      "unavailable-features": [
-        "avx",
-        "misalignsse",
-        "3dnowprefetch",
-        "xop",
-        "fma4"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G3",
-      "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-        "misalignsse"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G2",
-      "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G1",
-      "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Nehalem",
-      "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "IvyBridge",
-      "typename": "IvyBridge-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell",
-      "typename": "Haswell-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell-noTSX",
-      "typename": "Haswell-noTSX-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "EPYC",
-      "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "rdseed",
-        "sha-ni",
-        "fxsr-opt",
-        "misalignsse",
-        "3dnowprefetch",
-        "osvw",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Conroe",
-      "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell",
-      "typename": "Broadwell-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell-noTSX",
-      "typename": "Broadwell-noTSX-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid",
-        "rdseed",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "486",
-      "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    }
-  ],
-  "id": "libvirt-2"
-}
-
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "max"
-    }
-  },
-  "id": "libvirt-3"
-}
-
-{
-  "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": false,
-        "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": false,
-        "cr8legacy": true,
-        "xcrypt-en": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "pku": true,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": false,
-        "3dnowext": true,
-        "npt": false,
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": true,
-        "pfthreshold": false,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pae": true,
-        "pat": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "pcommit": true,
-        "syscall": true,
-        "avx512dq": false,
-        "svm": true,
-        "invtsc": false,
-        "sse2": true,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": false,
-        "cx8": true,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "pdcm": false,
-        "model": 6,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "fma": false,
-        "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": true,
-        "osvw": false,
-        "apic": true,
-        "pmm": false,
-        "tsc-adjust": false,
-        "kvm-steal-time": false,
-        "kvmclock": false,
-        "lwp": false,
-        "xop": false,
-        "avx": false,
-        "ospke": true,
-        "acpi": true,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "popcnt": true,
-        "xsaves": false,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "nodeid-msr": false,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "bmi1": true,
-        "bmi2": true,
-        "kvm-pv-unhalt": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "clflushopt": true,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": false,
-        "lmce": false,
-        "perfctr-nb": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vme": false,
-        "vmx": false,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": false,
-        "tbm": false,
-        "wdt": false,
-        "model-id": "QEMU TCG CPU version 2.5+",
-        "sha-ni": false,
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-3"
-}
-
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "full",
-    "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": false,
-        "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": false,
-        "cr8legacy": true,
-        "xcrypt-en": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "pku": true,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": false,
-        "3dnowext": true,
-        "npt": false,
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": true,
-        "pfthreshold": false,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pae": true,
-        "pat": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "pcommit": true,
-        "syscall": true,
-        "avx512dq": false,
-        "svm": true,
-        "invtsc": false,
-        "sse2": true,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": false,
-        "cx8": true,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "pdcm": false,
-        "model": 6,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "fma": false,
-        "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": true,
-        "osvw": false,
-        "apic": true,
-        "pmm": false,
-        "tsc-adjust": false,
-        "kvm-steal-time": false,
-        "kvmclock": false,
-        "lwp": false,
-        "xop": false,
-        "avx": false,
-        "ospke": true,
-        "acpi": true,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "popcnt": true,
-        "xsaves": false,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "nodeid-msr": false,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "bmi1": true,
-        "bmi2": true,
-        "kvm-pv-unhalt": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "clflushopt": true,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": false,
-        "lmce": false,
-        "perfctr-nb": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vme": false,
-        "vmx": false,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": false,
-        "tbm": false,
-        "wdt": false,
-        "model-id": "QEMU TCG CPU version 2.5+",
-        "sha-ni": false,
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-4"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483658,
-        "cmov": true,
-        "ia64": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "pause-filter": false,
-        "xsavec": false,
-        "osxsave": false,
-        "tsc-frequency": 0,
-        "xd": true,
-        "hv-vendor-id": "",
-        "kvm-asyncpf": false,
-        "kvm_asyncpf": false,
-        "perfctr_core": false,
-        "perfctr-core": false,
-        "mpx": true,
-        "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": true,
-        "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,
-        "cr8legacy": true,
-        "cpuid-0xb": true,
-        "xcrypt-en": false,
-        "kvm_pv_eoi": false,
-        "apic-id": 4294967295,
-        "pn": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "pku": true,
-        "smx": false,
-        "cmp_legacy": false,
-        "cmp-legacy": false,
-        "node-id": -1,
-        "avx512-4fmaps": false,
-        "vmcb_clean": false,
-        "vmcb-clean": false,
-        "3dnowext": true,
-        "hle": false,
-        "npt": false,
-        "memory": "/machine/unattached/system[0]",
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm_lock": false,
-        "svm-lock": false,
-        "pfthreshold": false,
-        "smep": true,
-        "smap": true,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "hv-stimer": false,
-        "i64": true,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pat": true,
-        "pae": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm_nopiodelay": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "socket-id": -1,
-        "pcommit": true,
-        "syscall": true,
-        "level": 13,
-        "avx512dq": false,
-        "svm": true,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
-        "invtsc": false,
-        "sse3": true,
-        "sse2": true,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": false,
-        "cx8": true,
-        "kvm_mmu": false,
-        "kvm-mmu": false,
-        "sse4_2": true,
-        "sse4.2": true,
-        "sse4-2": true,
-        "pge": true,
-        "fill-mtrr-mask": true,
-        "nodeid_msr": false,
-        "pdcm": false,
-        "movbe": true,
-        "model": 6,
-        "nrip_save": false,
-        "nrip-save": false,
-        "kvm_pv_unhalt": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "fma": false,
-        "cx16": true,
-        "de": true,
-        "enforce": false,
-        "stepping": 3,
-        "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": true,
-        "osvw": false,
-        "check": true,
-        "hv-spinlocks": -1,
-        "pmu": false,
-        "pmm": false,
-        "apic": true,
-        "min-xlevel2": 0,
-        "tsc-adjust": false,
-        "tsc_adjust": false,
-        "kvm-steal-time": false,
-        "kvm_steal_time": false,
-        "kvmclock": false,
-        "l3-cache": true,
-        "lwp": false,
-        "xop": false,
-        "avx": false,
-        "ospke": true,
-        "ace2": false,
-        "avx512bw": false,
-        "acpi": true,
-        "hv-vapic": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "popcnt": true,
-        "xsaves": false,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "pclmuldq": true,
-        "x-hv-max-vps": -1,
-        "nodeid-msr": false,
-        "kvm": true,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "kvm-pv-unhalt": false,
-        "bmi2": true,
-        "bmi1": true,
-        "realized": false,
-        "tsc_scale": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "hv-vpindex": false,
-        "xlevel2": 0,
-        "clflushopt": true,
-        "kvm-no-smi-migration": false,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "lahf_lm": true,
-        "fxsr-opt": false,
-        "hv-synic": false,
-        "xstore": false,
-        "fxsr_opt": false,
-        "rtm": false,
-        "lmce": false,
-        "hv-time": false,
-        "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vmx": false,
-        "vme": false,
-        "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": "QEMU TCG CPU version 2.5+",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
+      "typename": "base-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "qemu64",
+      "typename": "qemu64-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "qemu32",
+      "typename": "qemu32-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "phenom",
+      "typename": "phenom-x86_64-cpu",
+      "unavailable-features": [
+        "fxsr-opt",
+        "npt"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium3",
+      "typename": "pentium3-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium2",
+      "typename": "pentium2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium",
+      "typename": "pentium-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "n270",
+      "typename": "n270-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "kvm64",
+      "typename": "kvm64-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "kvm32",
+      "typename": "kvm32-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "coreduo",
+      "typename": "coreduo-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "core2duo",
+      "typename": "core2duo-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "athlon",
+      "typename": "athlon-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Westmere",
+      "typename": "Westmere-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Server",
+      "typename": "Skylake-Server-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Client",
+      "typename": "Skylake-Client-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "SandyBridge",
+      "typename": "SandyBridge-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Penryn",
+      "typename": "Penryn-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G5",
+      "typename": "Opteron_G5-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "misalignsse",
+        "3dnowprefetch",
+        "xop",
+        "fma4",
+        "tbm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G4",
+      "typename": "Opteron_G4-x86_64-cpu",
+      "unavailable-features": [
+        "avx",
+        "misalignsse",
+        "3dnowprefetch",
+        "xop",
+        "fma4"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G3",
+      "typename": "Opteron_G3-x86_64-cpu",
+      "unavailable-features": [
+        "misalignsse"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G2",
+      "typename": "Opteron_G2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G1",
+      "typename": "Opteron_G1-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Nehalem",
+      "typename": "Nehalem-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "IvyBridge",
+      "typename": "IvyBridge-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell",
+      "typename": "Haswell-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-noTSX",
+      "typename": "Haswell-noTSX-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "EPYC",
+      "typename": "EPYC-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "rdseed",
+        "sha-ni",
+        "fxsr-opt",
+        "misalignsse",
+        "3dnowprefetch",
+        "osvw",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Conroe",
+      "typename": "Conroe-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell",
+      "typename": "Broadwell-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-noTSX",
+      "typename": "Broadwell-noTSX-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid",
+        "rdseed",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "486",
+      "typename": "486-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
     }
-  },
-  "id": "libvirt-4"
+  ],
+  "id": "libvirt-2"
 }
 
 {
@@ -18714,13 +17242,10 @@
   "arguments": {
     "type": "static",
     "model": {
-      "name": "max",
-      "props": {
-        "migratable": false
-      }
+      "name": "max"
     }
   },
-  "id": "libvirt-5"
+  "id": "libvirt-3"
 }
 
 {
@@ -18900,13 +17425,25 @@
       }
     }
   },
-  "id": "libvirt-5"
+  "id": "libvirt-3"
 }
 
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
-    "type": "full",
+    "type": "static",
+    "model": {
+      "name": "max",
+      "props": {
+        "migratable": false
+      }
+    }
+  },
+  "id": "libvirt-4"
+}
+
+{
+  "return": {
     "model": {
       "name": "base",
       "props": {
@@ -19082,257 +17619,12 @@
       }
     }
   },
-  "id": "libvirt-6"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483658,
-        "cmov": true,
-        "ia64": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "pause-filter": false,
-        "xsavec": false,
-        "osxsave": false,
-        "tsc-frequency": 0,
-        "xd": true,
-        "hv-vendor-id": "",
-        "kvm-asyncpf": false,
-        "kvm_asyncpf": false,
-        "perfctr_core": false,
-        "perfctr-core": false,
-        "mpx": true,
-        "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": true,
-        "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,
-        "cr8legacy": true,
-        "cpuid-0xb": true,
-        "xcrypt-en": false,
-        "kvm_pv_eoi": false,
-        "apic-id": 4294967295,
-        "pn": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "pku": true,
-        "smx": false,
-        "cmp_legacy": false,
-        "cmp-legacy": false,
-        "node-id": -1,
-        "avx512-4fmaps": false,
-        "vmcb_clean": false,
-        "vmcb-clean": false,
-        "3dnowext": true,
-        "hle": false,
-        "npt": false,
-        "memory": "/machine/unattached/system[0]",
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm_lock": false,
-        "svm-lock": false,
-        "pfthreshold": false,
-        "smep": true,
-        "smap": true,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "hv-stimer": false,
-        "i64": true,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pat": true,
-        "pae": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm_nopiodelay": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "socket-id": -1,
-        "pcommit": true,
-        "syscall": true,
-        "level": 13,
-        "avx512dq": false,
-        "svm": true,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
-        "invtsc": false,
-        "sse3": true,
-        "sse2": true,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": false,
-        "cx8": true,
-        "kvm_mmu": false,
-        "kvm-mmu": false,
-        "sse4_2": true,
-        "sse4.2": true,
-        "sse4-2": true,
-        "pge": true,
-        "fill-mtrr-mask": true,
-        "nodeid_msr": false,
-        "pdcm": false,
-        "movbe": true,
-        "model": 6,
-        "nrip_save": false,
-        "nrip-save": false,
-        "kvm_pv_unhalt": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "fma": false,
-        "cx16": true,
-        "de": true,
-        "enforce": false,
-        "stepping": 3,
-        "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": true,
-        "osvw": false,
-        "check": true,
-        "hv-spinlocks": -1,
-        "pmu": false,
-        "pmm": false,
-        "apic": true,
-        "min-xlevel2": 0,
-        "tsc-adjust": false,
-        "tsc_adjust": false,
-        "kvm-steal-time": false,
-        "kvm_steal_time": false,
-        "kvmclock": false,
-        "l3-cache": true,
-        "lwp": false,
-        "xop": false,
-        "avx": false,
-        "ospke": true,
-        "ace2": false,
-        "avx512bw": false,
-        "acpi": true,
-        "hv-vapic": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "popcnt": true,
-        "xsaves": false,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "pclmuldq": true,
-        "x-hv-max-vps": -1,
-        "nodeid-msr": false,
-        "kvm": true,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "kvm-pv-unhalt": false,
-        "bmi2": true,
-        "bmi1": true,
-        "realized": false,
-        "tsc_scale": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "hv-vpindex": false,
-        "xlevel2": 0,
-        "clflushopt": true,
-        "kvm-no-smi-migration": false,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "lahf_lm": true,
-        "fxsr-opt": false,
-        "hv-synic": false,
-        "xstore": false,
-        "fxsr_opt": false,
-        "rtm": false,
-        "lmce": false,
-        "hv-time": false,
-        "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vmx": false,
-        "vme": false,
-        "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": "QEMU TCG CPU version 2.5+",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-6"
+  "id": "libvirt-4"
 }
 
 {
   "execute": "query-machines",
-  "id": "libvirt-7"
+  "id": "libvirt-5"
 }
 
 {
@@ -19521,5 +17813,5 @@
       "cpu-max": 288
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-5"
 }
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index d6549d6440..61e267a21a 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -178,9 +178,6 @@
   <package> (v2.11.0)</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
-    <property name='phys-bits' type='number' value='0'/>
-    <property name='core-id' type='number' value='-1'/>
-    <property name='xlevel' type='number' value='2147483656'/>
     <property name='cmov' type='boolean' value='true' migratable='yes'/>
     <property name='ia64' type='boolean' value='false'/>
     <property name='aes' type='boolean' value='true' migratable='yes'/>
@@ -190,34 +187,22 @@
     <property name='pause-filter' type='boolean' value='false'/>
     <property name='xsavec' type='boolean' value='true' migratable='yes'/>
     <property name='osxsave' type='boolean' value='false'/>
-    <property name='tsc-frequency' type='number' value='0'/>
-    <property name='xd' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-vendor-id' type='string' value=''/>
     <property name='kvm-asyncpf' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm_asyncpf' type='boolean' value='true' migratable='yes'/>
-    <property name='perfctr_core' type='boolean' value='false'/>
     <property name='perfctr-core' type='boolean' value='false'/>
     <property name='mpx' type='boolean' value='true' migratable='yes'/>
     <property name='pbe' type='boolean' value='false'/>
-    <property name='decodeassists' type='boolean' value='false'/>
     <property name='avx512cd' type='boolean' value='false'/>
-    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
+    <property name='decodeassists' type='boolean' value='false'/>
     <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
     <property name='family' type='number' value='6'/>
-    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
     <property name='avx512f' type='boolean' value='false'/>
     <property name='msr' type='boolean' value='true' migratable='yes'/>
     <property name='mce' type='boolean' value='true' migratable='yes'/>
     <property name='mca' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-runtime' type='boolean' value='false'/>
     <property name='xcrypt' type='boolean' value='false'/>
-    <property name='thread-id' type='number' value='-1'/>
     <property name='min-level' type='number' value='13'/>
     <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
     <property name='cid' type='boolean' value='false'/>
-    <property name='hv-relaxed' type='boolean' value='false'/>
-    <property name='hv-crash' type='boolean' value='false'/>
     <property name='ds' type='boolean' value='false'/>
     <property name='fxsr' type='boolean' value='true' migratable='yes'/>
     <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
@@ -228,81 +213,58 @@
     <property name='extapic' type='boolean' value='false'/>
     <property name='3dnowprefetch' type='boolean' value='true' migratable='yes'/>
     <property name='cr8legacy' type='boolean' value='false'/>
-    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
     <property name='xcrypt-en' type='boolean' value='false'/>
-    <property name='kvm_pv_eoi' type='boolean' value='true' migratable='yes'/>
-    <property name='apic-id' type='number' value='4294967295'/>
     <property name='pn' type='boolean' value='false'/>
     <property name='dca' type='boolean' value='false'/>
     <property name='vendor' type='string' value='GenuineIntel'/>
     <property name='pku' type='boolean' value='false'/>
     <property name='smx' type='boolean' value='false'/>
-    <property name='cmp_legacy' type='boolean' value='false'/>
     <property name='cmp-legacy' type='boolean' value='false'/>
-    <property name='node-id' type='number' value='-1'/>
     <property name='avx512-4fmaps' type='boolean' value='false'/>
-    <property name='vmcb_clean' type='boolean' value='false'/>
     <property name='vmcb-clean' type='boolean' value='false'/>
-    <property name='3dnowext' type='boolean' value='false'/>
     <property name='hle' type='boolean' value='true' migratable='yes'/>
+    <property name='3dnowext' type='boolean' value='false'/>
     <property name='npt' type='boolean' value='false'/>
-    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
     <property name='clwb' type='boolean' value='false'/>
     <property name='lbrv' type='boolean' value='false'/>
     <property name='adx' type='boolean' value='true' migratable='yes'/>
     <property name='ss' type='boolean' value='true' migratable='yes'/>
     <property name='pni' type='boolean' value='true' migratable='yes'/>
-    <property name='svm_lock' type='boolean' value='false'/>
     <property name='svm-lock' type='boolean' value='false'/>
-    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='smep' type='boolean' value='true' migratable='yes'/>
     <property name='smap' type='boolean' value='true' migratable='yes'/>
+    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='x2apic' type='boolean' value='true' migratable='yes'/>
     <property name='avx512vbmi' type='boolean' value='false'/>
-    <property name='hv-stimer' type='boolean' value='false'/>
-    <property name='i64' type='boolean' value='true' migratable='yes'/>
     <property name='flushbyasid' type='boolean' value='false'/>
     <property name='f16c' type='boolean' value='true' migratable='yes'/>
     <property name='ace2-en' type='boolean' value='false'/>
-    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='pae' type='boolean' value='true' migratable='yes'/>
+    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='sse' type='boolean' value='true' migratable='yes'/>
     <property name='phe-en' type='boolean' value='false'/>
-    <property name='kvm_nopiodelay' type='boolean' value='true' migratable='yes'/>
     <property name='kvm-nopiodelay' type='boolean' value='true' migratable='yes'/>
     <property name='tm' type='boolean' value='false'/>
     <property name='kvmclock-stable-bit' type='boolean' value='true' migratable='yes'/>
     <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-    <property name='socket-id' type='number' value='-1'/>
     <property name='pcommit' type='boolean' value='false'/>
     <property name='syscall' type='boolean' value='true' migratable='yes'/>
-    <property name='level' type='number' value='13'/>
     <property name='avx512dq' type='boolean' value='false'/>
     <property name='svm' type='boolean' value='false'/>
-    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-reset' type='boolean' value='false'/>
     <property name='invtsc' type='boolean' value='true' migratable='no'/>
-    <property name='sse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse2' type='boolean' value='true' migratable='yes'/>
     <property name='est' type='boolean' value='false'/>
     <property name='avx512ifma' type='boolean' value='false'/>
     <property name='tm2' type='boolean' value='false'/>
     <property name='kvm-pv-eoi' type='boolean' value='true' migratable='yes'/>
     <property name='cx8' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm_mmu' type='boolean' value='false'/>
     <property name='kvm-mmu' type='boolean' value='false'/>
-    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
     <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
     <property name='pge' type='boolean' value='true' migratable='yes'/>
-    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
-    <property name='nodeid_msr' type='boolean' value='false'/>
     <property name='pdcm' type='boolean' value='false'/>
-    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='model' type='number' value='94'/>
-    <property name='nrip_save' type='boolean' value='false'/>
+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='nrip-save' type='boolean' value='false'/>
-    <property name='kvm_pv_unhalt' type='boolean' value='true' migratable='yes'/>
     <property name='ssse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse4a' type='boolean' value='false'/>
     <property name='invpcid' type='boolean' value='true' migratable='yes'/>
@@ -311,7 +273,6 @@
     <property name='fma' type='boolean' value='true' migratable='yes'/>
     <property name='cx16' type='boolean' value='true' migratable='yes'/>
     <property name='de' type='boolean' value='true' migratable='yes'/>
-    <property name='enforce' type='boolean' value='false'/>
     <property name='stepping' type='number' value='3'/>
     <property name='xsave' type='boolean' value='true' migratable='yes'/>
     <property name='clflush' type='boolean' value='true' migratable='yes'/>
@@ -319,33 +280,23 @@
     <property name='tsc' type='boolean' value='true' migratable='yes'/>
     <property name='tce' type='boolean' value='false'/>
     <property name='fpu' type='boolean' value='true' migratable='yes'/>
-    <property name='ibs' type='boolean' value='false'/>
-    <property name='ds_cpl' type='boolean' value='false'/>
     <property name='ds-cpl' type='boolean' value='false'/>
-    <property name='host-phys-bits' type='boolean' value='false'/>
+    <property name='ibs' type='boolean' value='false'/>
     <property name='fma4' type='boolean' value='false'/>
     <property name='la57' type='boolean' value='false'/>
     <property name='osvw' type='boolean' value='false'/>
-    <property name='check' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-spinlocks' type='number' value='-1'/>
-    <property name='pmu' type='boolean' value='false'/>
-    <property name='pmm' type='boolean' value='false'/>
     <property name='apic' type='boolean' value='true' migratable='yes'/>
-    <property name='min-xlevel2' type='number' value='0'/>
+    <property name='pmm' type='boolean' value='false'/>
     <property name='tsc-adjust' type='boolean' value='true' migratable='yes'/>
-    <property name='tsc_adjust' type='boolean' value='true' migratable='yes'/>
     <property name='kvm-steal-time' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm_steal_time' type='boolean' value='true' migratable='yes'/>
     <property name='kvmclock' type='boolean' value='true' migratable='yes'/>
-    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
     <property name='lwp' type='boolean' value='false'/>
     <property name='xop' type='boolean' value='false'/>
     <property name='avx' type='boolean' value='true' migratable='yes'/>
     <property name='ospke' type='boolean' value='false'/>
-    <property name='ace2' type='boolean' value='false'/>
-    <property name='avx512bw' type='boolean' value='false'/>
     <property name='acpi' type='boolean' value='false'/>
-    <property name='hv-vapic' type='boolean' value='false'/>
+    <property name='avx512bw' type='boolean' value='false'/>
+    <property name='ace2' type='boolean' value='false'/>
     <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
     <property name='ht' type='boolean' value='false'/>
     <property name='nx' type='boolean' value='true' migratable='yes'/>
@@ -353,29 +304,20 @@
     <property name='mmxext' type='boolean' value='false'/>
     <property name='popcnt' type='boolean' value='true' migratable='yes'/>
     <property name='xsaves' type='boolean' value='true' migratable='yes'/>
-    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
     <property name='lm' type='boolean' value='true' migratable='yes'/>
     <property name='umip' type='boolean' value='true' migratable='yes'/>
     <property name='pse' type='boolean' value='true' migratable='yes'/>
     <property name='avx2' type='boolean' value='true' migratable='yes'/>
     <property name='sep' type='boolean' value='true' migratable='yes'/>
-    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
-    <property name='x-hv-max-vps' type='number' value='-1'/>
     <property name='nodeid-msr' type='boolean' value='false'/>
-    <property name='kvm' type='boolean' value='true' migratable='yes'/>
     <property name='misalignsse' type='boolean' value='false'/>
     <property name='min-xlevel' type='number' value='2147483656'/>
-    <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/>
-    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
     <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-    <property name='realized' type='boolean' value='false'/>
-    <property name='tsc_scale' type='boolean' value='false'/>
+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/>
     <property name='tsc-scale' type='boolean' value='false'/>
     <property name='topoext' type='boolean' value='false'/>
-    <property name='hv-vpindex' type='boolean' value='false'/>
-    <property name='xlevel2' type='number' value='0'/>
     <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
     <property name='monitor' type='boolean' value='false'/>
     <property name='avx512er' type='boolean' value='false'/>
     <property name='pmm-en' type='boolean' value='false'/>
@@ -383,22 +325,16 @@
     <property name='3dnow' type='boolean' value='false'/>
     <property name='erms' type='boolean' value='true' migratable='yes'/>
     <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
     <property name='fxsr-opt' type='boolean' value='false'/>
-    <property name='hv-synic' type='boolean' value='false'/>
     <property name='xstore' type='boolean' value='false'/>
-    <property name='fxsr_opt' type='boolean' value='false'/>
     <property name='rtm' type='boolean' value='true' migratable='yes'/>
     <property name='lmce' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-time' type='boolean' value='false'/>
     <property name='perfctr-nb' type='boolean' value='false'/>
-    <property name='perfctr_nb' type='boolean' value='false'/>
-    <property name='ffxsr' type='boolean' value='false'/>
     <property name='rdrand' type='boolean' value='true' migratable='yes'/>
     <property name='rdseed' type='boolean' value='true' migratable='yes'/>
     <property name='avx512-4vnniw' type='boolean' value='false'/>
-    <property name='vmx' type='boolean' value='true' migratable='yes'/>
     <property name='vme' type='boolean' value='true' migratable='yes'/>
+    <property name='vmx' type='boolean' value='true' migratable='yes'/>
     <property name='dtes64' type='boolean' value='false'/>
     <property name='mtrr' type='boolean' value='true' migratable='yes'/>
     <property name='rdtscp' type='boolean' value='true' migratable='yes'/>
@@ -406,9 +342,8 @@
     <property name='kvm-pv-tlb-flush' type='boolean' value='true' migratable='yes'/>
     <property name='tbm' type='boolean' value='false'/>
     <property name='wdt' type='boolean' value='false'/>
-    <property name='pause_filter' type='boolean' value='false'/>
-    <property name='sha-ni' type='boolean' value='false'/>
     <property name='model-id' type='string' value='Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz'/>
+    <property name='sha-ni' type='boolean' value='false'/>
     <property name='abm' type='boolean' value='true' migratable='yes'/>
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
@@ -526,9 +461,6 @@
   <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
   <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
   <hostCPU type='tcg' model='base' migratability='yes'>
-    <property name='phys-bits' type='number' value='0'/>
-    <property name='core-id' type='number' value='-1'/>
-    <property name='xlevel' type='number' value='2147483658'/>
     <property name='cmov' type='boolean' value='true' migratable='yes'/>
     <property name='ia64' type='boolean' value='false'/>
     <property name='aes' type='boolean' value='true' migratable='yes'/>
@@ -538,34 +470,22 @@
     <property name='pause-filter' type='boolean' value='false'/>
     <property name='xsavec' type='boolean' value='false'/>
     <property name='osxsave' type='boolean' value='false'/>
-    <property name='tsc-frequency' type='number' value='0'/>
-    <property name='xd' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-vendor-id' type='string' value=''/>
     <property name='kvm-asyncpf' type='boolean' value='false'/>
-    <property name='kvm_asyncpf' type='boolean' value='false'/>
-    <property name='perfctr_core' type='boolean' value='false'/>
     <property name='perfctr-core' type='boolean' value='false'/>
     <property name='mpx' type='boolean' value='true' migratable='yes'/>
     <property name='pbe' type='boolean' value='false'/>
-    <property name='decodeassists' type='boolean' value='false'/>
     <property name='avx512cd' type='boolean' value='false'/>
-    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
+    <property name='decodeassists' type='boolean' value='false'/>
     <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
     <property name='family' type='number' value='6'/>
-    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
     <property name='avx512f' type='boolean' value='false'/>
     <property name='msr' type='boolean' value='true' migratable='yes'/>
     <property name='mce' type='boolean' value='true' migratable='yes'/>
     <property name='mca' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-runtime' type='boolean' value='false'/>
     <property name='xcrypt' type='boolean' value='false'/>
-    <property name='thread-id' type='number' value='-1'/>
     <property name='min-level' type='number' value='13'/>
     <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
     <property name='cid' type='boolean' value='false'/>
-    <property name='hv-relaxed' type='boolean' value='false'/>
-    <property name='hv-crash' type='boolean' value='false'/>
     <property name='ds' type='boolean' value='false'/>
     <property name='fxsr' type='boolean' value='true' migratable='yes'/>
     <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
@@ -576,81 +496,58 @@
     <property name='extapic' type='boolean' value='false'/>
     <property name='3dnowprefetch' type='boolean' value='false'/>
     <property name='cr8legacy' type='boolean' value='true' migratable='yes'/>
-    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
     <property name='xcrypt-en' type='boolean' value='false'/>
-    <property name='kvm_pv_eoi' type='boolean' value='false'/>
-    <property name='apic-id' type='number' value='4294967295'/>
     <property name='pn' type='boolean' value='false'/>
     <property name='dca' type='boolean' value='false'/>
     <property name='vendor' type='string' value='AuthenticAMD'/>
     <property name='pku' type='boolean' value='true' migratable='yes'/>
     <property name='smx' type='boolean' value='false'/>
-    <property name='cmp_legacy' type='boolean' value='false'/>
     <property name='cmp-legacy' type='boolean' value='false'/>
-    <property name='node-id' type='number' value='-1'/>
     <property name='avx512-4fmaps' type='boolean' value='false'/>
-    <property name='vmcb_clean' type='boolean' value='false'/>
     <property name='vmcb-clean' type='boolean' value='false'/>
-    <property name='3dnowext' type='boolean' value='true' migratable='yes'/>
     <property name='hle' type='boolean' value='false'/>
+    <property name='3dnowext' type='boolean' value='true' migratable='yes'/>
     <property name='npt' type='boolean' value='false'/>
-    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
     <property name='clwb' type='boolean' value='true' migratable='yes'/>
     <property name='lbrv' type='boolean' value='false'/>
     <property name='adx' type='boolean' value='true' migratable='yes'/>
     <property name='ss' type='boolean' value='true' migratable='yes'/>
     <property name='pni' type='boolean' value='true' migratable='yes'/>
-    <property name='svm_lock' type='boolean' value='false'/>
     <property name='svm-lock' type='boolean' value='false'/>
-    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='smep' type='boolean' value='true' migratable='yes'/>
     <property name='smap' type='boolean' value='true' migratable='yes'/>
+    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='x2apic' type='boolean' value='false'/>
     <property name='avx512vbmi' type='boolean' value='false'/>
-    <property name='hv-stimer' type='boolean' value='false'/>
-    <property name='i64' type='boolean' value='true' migratable='yes'/>
     <property name='flushbyasid' type='boolean' value='false'/>
     <property name='f16c' type='boolean' value='false'/>
     <property name='ace2-en' type='boolean' value='false'/>
-    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='pae' type='boolean' value='true' migratable='yes'/>
+    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='sse' type='boolean' value='true' migratable='yes'/>
     <property name='phe-en' type='boolean' value='false'/>
-    <property name='kvm_nopiodelay' type='boolean' value='false'/>
     <property name='kvm-nopiodelay' type='boolean' value='false'/>
     <property name='tm' type='boolean' value='false'/>
     <property name='kvmclock-stable-bit' type='boolean' value='false'/>
     <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-    <property name='socket-id' type='number' value='-1'/>
     <property name='pcommit' type='boolean' value='true' migratable='yes'/>
     <property name='syscall' type='boolean' value='true' migratable='yes'/>
-    <property name='level' type='number' value='13'/>
     <property name='avx512dq' type='boolean' value='false'/>
     <property name='svm' type='boolean' value='true' migratable='yes'/>
-    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-reset' type='boolean' value='false'/>
     <property name='invtsc' type='boolean' value='false'/>
-    <property name='sse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse2' type='boolean' value='true' migratable='yes'/>
     <property name='est' type='boolean' value='false'/>
     <property name='avx512ifma' type='boolean' value='false'/>
     <property name='tm2' type='boolean' value='false'/>
     <property name='kvm-pv-eoi' type='boolean' value='false'/>
     <property name='cx8' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm_mmu' type='boolean' value='false'/>
     <property name='kvm-mmu' type='boolean' value='false'/>
-    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
     <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
     <property name='pge' type='boolean' value='true' migratable='yes'/>
-    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
-    <property name='nodeid_msr' type='boolean' value='false'/>
     <property name='pdcm' type='boolean' value='false'/>
-    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='model' type='number' value='6'/>
-    <property name='nrip_save' type='boolean' value='false'/>
+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='nrip-save' type='boolean' value='false'/>
-    <property name='kvm_pv_unhalt' type='boolean' value='false'/>
     <property name='ssse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse4a' type='boolean' value='true' migratable='yes'/>
     <property name='invpcid' type='boolean' value='false'/>
@@ -659,7 +556,6 @@
     <property name='fma' type='boolean' value='false'/>
     <property name='cx16' type='boolean' value='true' migratable='yes'/>
     <property name='de' type='boolean' value='true' migratable='yes'/>
-    <property name='enforce' type='boolean' value='false'/>
     <property name='stepping' type='number' value='3'/>
     <property name='xsave' type='boolean' value='true' migratable='yes'/>
     <property name='clflush' type='boolean' value='true' migratable='yes'/>
@@ -667,33 +563,23 @@
     <property name='tsc' type='boolean' value='true' migratable='yes'/>
     <property name='tce' type='boolean' value='false'/>
     <property name='fpu' type='boolean' value='true' migratable='yes'/>
-    <property name='ibs' type='boolean' value='false'/>
-    <property name='ds_cpl' type='boolean' value='false'/>
     <property name='ds-cpl' type='boolean' value='false'/>
-    <property name='host-phys-bits' type='boolean' value='false'/>
+    <property name='ibs' type='boolean' value='false'/>
     <property name='fma4' type='boolean' value='false'/>
     <property name='la57' type='boolean' value='true' migratable='yes'/>
     <property name='osvw' type='boolean' value='false'/>
-    <property name='check' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-spinlocks' type='number' value='-1'/>
-    <property name='pmu' type='boolean' value='false'/>
-    <property name='pmm' type='boolean' value='false'/>
     <property name='apic' type='boolean' value='true' migratable='yes'/>
-    <property name='min-xlevel2' type='number' value='0'/>
+    <property name='pmm' type='boolean' value='false'/>
     <property name='tsc-adjust' type='boolean' value='false'/>
-    <property name='tsc_adjust' type='boolean' value='false'/>
     <property name='kvm-steal-time' type='boolean' value='false'/>
-    <property name='kvm_steal_time' type='boolean' value='false'/>
     <property name='kvmclock' type='boolean' value='false'/>
-    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
     <property name='lwp' type='boolean' value='false'/>
     <property name='xop' type='boolean' value='false'/>
     <property name='avx' type='boolean' value='false'/>
     <property name='ospke' type='boolean' value='true' migratable='yes'/>
-    <property name='ace2' type='boolean' value='false'/>
-    <property name='avx512bw' type='boolean' value='false'/>
     <property name='acpi' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-vapic' type='boolean' value='false'/>
+    <property name='avx512bw' type='boolean' value='false'/>
+    <property name='ace2' type='boolean' value='false'/>
     <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
     <property name='ht' type='boolean' value='false'/>
     <property name='nx' type='boolean' value='true' migratable='yes'/>
@@ -701,29 +587,20 @@
     <property name='mmxext' type='boolean' value='true' migratable='yes'/>
     <property name='popcnt' type='boolean' value='true' migratable='yes'/>
     <property name='xsaves' type='boolean' value='false'/>
-    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
     <property name='lm' type='boolean' value='true' migratable='yes'/>
     <property name='umip' type='boolean' value='false'/>
     <property name='pse' type='boolean' value='true' migratable='yes'/>
     <property name='avx2' type='boolean' value='false'/>
     <property name='sep' type='boolean' value='true' migratable='yes'/>
-    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
-    <property name='x-hv-max-vps' type='number' value='-1'/>
     <property name='nodeid-msr' type='boolean' value='false'/>
-    <property name='kvm' type='boolean' value='true' migratable='yes'/>
     <property name='misalignsse' type='boolean' value='false'/>
     <property name='min-xlevel' type='number' value='2147483658'/>
-    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
-    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
     <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-    <property name='realized' type='boolean' value='false'/>
-    <property name='tsc_scale' type='boolean' value='false'/>
+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
     <property name='tsc-scale' type='boolean' value='false'/>
     <property name='topoext' type='boolean' value='false'/>
-    <property name='hv-vpindex' type='boolean' value='false'/>
-    <property name='xlevel2' type='number' value='0'/>
     <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
     <property name='monitor' type='boolean' value='true' migratable='yes'/>
     <property name='avx512er' type='boolean' value='false'/>
     <property name='pmm-en' type='boolean' value='false'/>
@@ -731,22 +608,16 @@
     <property name='3dnow' type='boolean' value='true' migratable='yes'/>
     <property name='erms' type='boolean' value='true' migratable='yes'/>
     <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
     <property name='fxsr-opt' type='boolean' value='false'/>
-    <property name='hv-synic' type='boolean' value='false'/>
     <property name='xstore' type='boolean' value='false'/>
-    <property name='fxsr_opt' type='boolean' value='false'/>
     <property name='rtm' type='boolean' value='false'/>
     <property name='lmce' type='boolean' value='false'/>
-    <property name='hv-time' type='boolean' value='false'/>
     <property name='perfctr-nb' type='boolean' value='false'/>
-    <property name='perfctr_nb' type='boolean' value='false'/>
-    <property name='ffxsr' type='boolean' value='false'/>
     <property name='rdrand' type='boolean' value='false'/>
     <property name='rdseed' type='boolean' value='false'/>
     <property name='avx512-4vnniw' type='boolean' value='false'/>
-    <property name='vmx' type='boolean' value='false'/>
     <property name='vme' type='boolean' value='false'/>
+    <property name='vmx' type='boolean' value='false'/>
     <property name='dtes64' type='boolean' value='false'/>
     <property name='mtrr' type='boolean' value='true' migratable='yes'/>
     <property name='rdtscp' type='boolean' value='true' migratable='yes'/>
@@ -754,9 +625,8 @@
     <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
     <property name='tbm' type='boolean' value='false'/>
     <property name='wdt' type='boolean' value='false'/>
-    <property name='pause_filter' type='boolean' value='false'/>
-    <property name='sha-ni' type='boolean' value='false'/>
     <property name='model-id' type='string' value='QEMU TCG CPU version 2.5+'/>
+    <property name='sha-ni' type='boolean' value='false'/>
     <property name='abm' type='boolean' value='true' migratable='yes'/>
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
index 5fefbc64ab..ca803620a8 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -19800,7 +19800,19 @@
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
-    "type": "full",
+    "type": "static",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false
+      }
+    }
+  },
+  "id": "libvirt-49"
+}
+
+{
+  "return": {
     "model": {
       "name": "base",
       "props": {
@@ -19881,7 +19893,7 @@
         "syscall": true,
         "avx512dq": false,
         "svm": false,
-        "invtsc": false,
+        "invtsc": true,
         "sse2": true,
         "est": false,
         "avx512ifma": false,
@@ -19989,2162 +20001,608 @@
   "id": "libvirt-49"
 }
 
+{
+  "execute": "qmp_capabilities",
+  "id": "libvirt-1"
+}
+
 {
   "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"
+  "id": "libvirt-1"
 }
 
 {
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "host",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-50"
+  "execute": "query-cpu-definitions",
+  "id": "libvirt-2"
 }
 
 {
-  "return": {
-    "model": {
+  "return": [
+    {
+      "name": "max",
+      "typename": "max-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": false
+    },
+    {
+      "name": "host",
+      "typename": "host-x86_64-cpu",
+      "unavailable-features": [
+        "kvm"
+      ],
+      "static": false,
+      "migration-safe": false
+    },
+    {
       "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": true,
-        "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-50"
-}
-
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "full",
-    "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": true,
-        "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-51"
-}
-
-{
-  "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": true,
-        "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-51"
-}
-
-{
-  "execute": "qmp_capabilities",
-  "id": "libvirt-1"
-}
-
-{
-  "return": {
-  },
-  "id": "libvirt-1"
-}
-
-{
-  "execute": "query-cpu-definitions",
-  "id": "libvirt-2"
-}
-
-{
-  "return": [
-    {
-      "name": "max",
-      "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": false
-    },
-    {
-      "name": "host",
-      "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-        "kvm"
-      ],
-      "static": false,
-      "migration-safe": false
-    },
-    {
-      "name": "base",
-      "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": true,
-      "migration-safe": true
-    },
-    {
-      "name": "qemu64",
-      "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "qemu32",
-      "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "phenom",
-      "typename": "phenom-x86_64-cpu",
-      "unavailable-features": [
-        "fxsr-opt",
-        "npt"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "pentium3",
-      "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "pentium2",
-      "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "pentium",
-      "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "n270",
-      "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "kvm64",
-      "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "kvm32",
-      "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "coreduo",
-      "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "core2duo",
-      "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "athlon",
-      "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Westmere",
-      "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Westmere-IBRS",
-      "typename": "Westmere-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Server",
-      "typename": "Skylake-Server-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "avx512f",
-        "avx512dq",
-        "rdseed",
-        "avx512cd",
-        "avx512bw",
-        "avx512vl",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Server-IBRS",
-      "typename": "Skylake-Server-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "avx512f",
-        "avx512dq",
-        "rdseed",
-        "avx512cd",
-        "avx512bw",
-        "avx512vl",
-        "spec-ctrl",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Client",
-      "typename": "Skylake-Client-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Client-IBRS",
-      "typename": "Skylake-Client-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "spec-ctrl",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "SandyBridge",
-      "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "SandyBridge-IBRS",
-      "typename": "SandyBridge-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Penryn",
-      "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G5",
-      "typename": "Opteron_G5-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "avx",
-        "f16c",
-        "misalignsse",
-        "3dnowprefetch",
-        "xop",
-        "fma4",
-        "tbm"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G4",
-      "typename": "Opteron_G4-x86_64-cpu",
-      "unavailable-features": [
-        "avx",
-        "misalignsse",
-        "3dnowprefetch",
-        "xop",
-        "fma4"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G3",
-      "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-        "misalignsse"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G2",
-      "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G1",
-      "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Nehalem",
-      "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Nehalem-IBRS",
-      "typename": "Nehalem-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "IvyBridge",
-      "typename": "IvyBridge-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "IvyBridge-IBRS",
-      "typename": "IvyBridge-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell",
-      "typename": "Haswell-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell-noTSX",
-      "typename": "Haswell-noTSX-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell-noTSX-IBRS",
-      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid",
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell-IBRS",
-      "typename": "Haswell-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "EPYC",
-      "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "rdseed",
-        "sha-ni",
-        "fxsr-opt",
-        "misalignsse",
-        "3dnowprefetch",
-        "osvw",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "EPYC-IBPB",
-      "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "rdseed",
-        "sha-ni",
-        "fxsr-opt",
-        "misalignsse",
-        "3dnowprefetch",
-        "osvw",
-        "ibpb",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Conroe",
-      "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell",
-      "typename": "Broadwell-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell-noTSX",
-      "typename": "Broadwell-noTSX-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid",
-        "rdseed",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell-noTSX-IBRS",
-      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid",
-        "rdseed",
-        "spec-ctrl",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell-IBRS",
-      "typename": "Broadwell-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "spec-ctrl",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "486",
-      "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    }
-  ],
-  "id": "libvirt-2"
-}
-
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "max"
-    }
-  },
-  "id": "libvirt-3"
-}
-
-{
-  "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": false,
-        "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": false,
-        "avx512vbmi2": false,
-        "cr8legacy": true,
-        "xcrypt-en": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "pku": true,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": false,
-        "3dnowext": true,
-        "npt": false,
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": true,
-        "pfthreshold": false,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pae": true,
-        "pat": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "pcommit": true,
-        "syscall": true,
-        "avx512dq": false,
-        "svm": true,
-        "invtsc": false,
-        "sse2": true,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": false,
-        "cx8": true,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "avx512bitalg": false,
-        "pdcm": false,
-        "model": 6,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "fma": false,
-        "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": true,
-        "osvw": false,
-        "apic": true,
-        "pmm": false,
-        "spec-ctrl": false,
-        "tsc-adjust": false,
-        "kvm-steal-time": false,
-        "kvmclock": false,
-        "lwp": false,
-        "xop": false,
-        "ibpb": false,
-        "avx": false,
-        "ospke": true,
-        "acpi": true,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "popcnt": true,
-        "vaes": false,
-        "xsaves": false,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "nodeid-msr": false,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "bmi1": true,
-        "bmi2": true,
-        "kvm-pv-unhalt": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "clflushopt": true,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": false,
-        "kvm-hint-dedicated": false,
-        "lmce": false,
-        "perfctr-nb": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vme": false,
-        "vmx": false,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": false,
-        "tbm": false,
-        "wdt": false,
-        "model-id": "QEMU TCG CPU version 2.5+",
-        "sha-ni": false,
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-3"
-}
-
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "full",
-    "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": false,
-        "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": false,
-        "avx512vbmi2": false,
-        "cr8legacy": true,
-        "xcrypt-en": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "pku": true,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": false,
-        "3dnowext": true,
-        "npt": false,
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": true,
-        "pfthreshold": false,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pae": true,
-        "pat": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "pcommit": true,
-        "syscall": true,
-        "avx512dq": false,
-        "svm": true,
-        "invtsc": false,
-        "sse2": true,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": false,
-        "cx8": true,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "avx512bitalg": false,
-        "pdcm": false,
-        "model": 6,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "fma": false,
-        "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": true,
-        "osvw": false,
-        "apic": true,
-        "pmm": false,
-        "spec-ctrl": false,
-        "tsc-adjust": false,
-        "kvm-steal-time": false,
-        "kvmclock": false,
-        "lwp": false,
-        "xop": false,
-        "ibpb": false,
-        "avx": false,
-        "ospke": true,
-        "acpi": true,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "popcnt": true,
-        "vaes": false,
-        "xsaves": false,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "nodeid-msr": false,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "bmi1": true,
-        "bmi2": true,
-        "kvm-pv-unhalt": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "clflushopt": true,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": false,
-        "kvm-hint-dedicated": false,
-        "lmce": false,
-        "perfctr-nb": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vme": false,
-        "vmx": false,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": false,
-        "tbm": false,
-        "wdt": false,
-        "model-id": "QEMU TCG CPU version 2.5+",
-        "sha-ni": false,
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-4"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483658,
-        "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": false,
-        "kvm_asyncpf": false,
-        "perfctr_core": false,
-        "perfctr-core": false,
-        "mpx": true,
-        "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": true,
-        "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": true,
-        "cpuid-0xb": true,
-        "xcrypt-en": false,
-        "kvm_pv_eoi": false,
-        "apic-id": 4294967295,
-        "pn": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "pku": true,
-        "smx": false,
-        "cmp_legacy": false,
-        "cmp-legacy": false,
-        "node-id": -1,
-        "avx512-4fmaps": false,
-        "vmcb_clean": false,
-        "vmcb-clean": false,
-        "3dnowext": true,
-        "hle": false,
-        "npt": false,
-        "memory": "/machine/unattached/system[0]",
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm_lock": false,
-        "svm-lock": false,
-        "pfthreshold": false,
-        "smep": true,
-        "smap": true,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "hv-stimer": false,
-        "i64": true,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pat": true,
-        "pae": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm_nopiodelay": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "socket-id": -1,
-        "pcommit": true,
-        "syscall": true,
-        "level": 13,
-        "avx512dq": false,
-        "svm": true,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
-        "invtsc": false,
-        "sse3": true,
-        "sse2": true,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": false,
-        "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": 6,
-        "nrip_save": false,
-        "nrip-save": false,
-        "kvm_pv_unhalt": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "fma": false,
-        "cx16": true,
-        "de": true,
-        "enforce": false,
-        "stepping": 3,
-        "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": true,
-        "osvw": false,
-        "check": true,
-        "hv-spinlocks": -1,
-        "pmu": false,
-        "pmm": false,
-        "apic": true,
-        "spec-ctrl": false,
-        "min-xlevel2": 0,
-        "tsc-adjust": false,
-        "tsc_adjust": false,
-        "kvm-steal-time": false,
-        "kvm_steal_time": false,
-        "kvmclock": false,
-        "l3-cache": true,
-        "lwp": false,
-        "ibpb": false,
-        "xop": false,
-        "avx": false,
-        "ospke": true,
-        "ace2": false,
-        "avx512bw": false,
-        "acpi": true,
-        "hv-vapic": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "vaes": false,
-        "popcnt": true,
-        "xsaves": false,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "pclmuldq": true,
-        "x-hv-max-vps": -1,
-        "nodeid-msr": false,
-        "kvm": true,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "kvm-pv-unhalt": false,
-        "bmi2": true,
-        "bmi1": true,
-        "realized": false,
-        "tsc_scale": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "hv-vpindex": false,
-        "xlevel2": 0,
-        "clflushopt": true,
-        "kvm-no-smi-migration": false,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "lahf_lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "hv-synic": false,
-        "xstore": false,
-        "fxsr_opt": false,
-        "kvm-hint-dedicated": false,
-        "rtm": false,
-        "lmce": false,
-        "hv-time": false,
-        "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vmx": false,
-        "vme": false,
-        "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": "QEMU TCG CPU version 2.5+",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
+      "typename": "base-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "qemu64",
+      "typename": "qemu64-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "qemu32",
+      "typename": "qemu32-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "phenom",
+      "typename": "phenom-x86_64-cpu",
+      "unavailable-features": [
+        "fxsr-opt",
+        "npt"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium3",
+      "typename": "pentium3-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium2",
+      "typename": "pentium2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium",
+      "typename": "pentium-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "n270",
+      "typename": "n270-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "kvm64",
+      "typename": "kvm64-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "kvm32",
+      "typename": "kvm32-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "coreduo",
+      "typename": "coreduo-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "core2duo",
+      "typename": "core2duo-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "athlon",
+      "typename": "athlon-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Westmere",
+      "typename": "Westmere-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Westmere-IBRS",
+      "typename": "Westmere-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Server",
+      "typename": "Skylake-Server-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Server-IBRS",
+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "spec-ctrl",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Client",
+      "typename": "Skylake-Client-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Client-IBRS",
+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "spec-ctrl",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "SandyBridge",
+      "typename": "SandyBridge-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "SandyBridge-IBRS",
+      "typename": "SandyBridge-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Penryn",
+      "typename": "Penryn-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G5",
+      "typename": "Opteron_G5-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "misalignsse",
+        "3dnowprefetch",
+        "xop",
+        "fma4",
+        "tbm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G4",
+      "typename": "Opteron_G4-x86_64-cpu",
+      "unavailable-features": [
+        "avx",
+        "misalignsse",
+        "3dnowprefetch",
+        "xop",
+        "fma4"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G3",
+      "typename": "Opteron_G3-x86_64-cpu",
+      "unavailable-features": [
+        "misalignsse"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G2",
+      "typename": "Opteron_G2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G1",
+      "typename": "Opteron_G1-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Nehalem",
+      "typename": "Nehalem-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Nehalem-IBRS",
+      "typename": "Nehalem-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "IvyBridge",
+      "typename": "IvyBridge-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "IvyBridge-IBRS",
+      "typename": "IvyBridge-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell",
+      "typename": "Haswell-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-noTSX",
+      "typename": "Haswell-noTSX-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-noTSX-IBRS",
+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-IBRS",
+      "typename": "Haswell-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "EPYC",
+      "typename": "EPYC-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "rdseed",
+        "sha-ni",
+        "fxsr-opt",
+        "misalignsse",
+        "3dnowprefetch",
+        "osvw",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "EPYC-IBPB",
+      "typename": "EPYC-IBPB-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "rdseed",
+        "sha-ni",
+        "fxsr-opt",
+        "misalignsse",
+        "3dnowprefetch",
+        "osvw",
+        "ibpb",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Conroe",
+      "typename": "Conroe-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell",
+      "typename": "Broadwell-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-noTSX",
+      "typename": "Broadwell-noTSX-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid",
+        "rdseed",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-noTSX-IBRS",
+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid",
+        "rdseed",
+        "spec-ctrl",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-IBRS",
+      "typename": "Broadwell-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "spec-ctrl",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "486",
+      "typename": "486-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
     }
-  },
-  "id": "libvirt-4"
+  ],
+  "id": "libvirt-2"
 }
 
 {
@@ -22152,13 +20610,10 @@
   "arguments": {
     "type": "static",
     "model": {
-      "name": "max",
-      "props": {
-        "migratable": false
-      }
+      "name": "max"
     }
   },
-  "id": "libvirt-5"
+  "id": "libvirt-3"
 }
 
 {
@@ -22348,13 +20803,25 @@
       }
     }
   },
-  "id": "libvirt-5"
+  "id": "libvirt-3"
 }
 
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
-    "type": "full",
+    "type": "static",
+    "model": {
+      "name": "max",
+      "props": {
+        "migratable": false
+      }
+    }
+  },
+  "id": "libvirt-4"
+}
+
+{
+  "return": {
     "model": {
       "name": "base",
       "props": {
@@ -22540,267 +21007,12 @@
       }
     }
   },
-  "id": "libvirt-6"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483658,
-        "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": false,
-        "kvm_asyncpf": false,
-        "perfctr_core": false,
-        "perfctr-core": false,
-        "mpx": true,
-        "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": true,
-        "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": true,
-        "cpuid-0xb": true,
-        "xcrypt-en": false,
-        "kvm_pv_eoi": false,
-        "apic-id": 4294967295,
-        "pn": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "pku": true,
-        "smx": false,
-        "cmp_legacy": false,
-        "cmp-legacy": false,
-        "node-id": -1,
-        "avx512-4fmaps": false,
-        "vmcb_clean": false,
-        "vmcb-clean": false,
-        "3dnowext": true,
-        "hle": false,
-        "npt": false,
-        "memory": "/machine/unattached/system[0]",
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm_lock": false,
-        "svm-lock": false,
-        "pfthreshold": false,
-        "smep": true,
-        "smap": true,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "hv-stimer": false,
-        "i64": true,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pat": true,
-        "pae": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm_nopiodelay": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "socket-id": -1,
-        "pcommit": true,
-        "syscall": true,
-        "level": 13,
-        "avx512dq": false,
-        "svm": true,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
-        "invtsc": false,
-        "sse3": true,
-        "sse2": true,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": false,
-        "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": 6,
-        "nrip_save": false,
-        "nrip-save": false,
-        "kvm_pv_unhalt": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "fma": false,
-        "cx16": true,
-        "de": true,
-        "enforce": false,
-        "stepping": 3,
-        "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": true,
-        "osvw": false,
-        "check": true,
-        "hv-spinlocks": -1,
-        "pmu": false,
-        "pmm": false,
-        "apic": true,
-        "spec-ctrl": false,
-        "min-xlevel2": 0,
-        "tsc-adjust": false,
-        "tsc_adjust": false,
-        "kvm-steal-time": false,
-        "kvm_steal_time": false,
-        "kvmclock": false,
-        "l3-cache": true,
-        "lwp": false,
-        "ibpb": false,
-        "xop": false,
-        "avx": false,
-        "ospke": true,
-        "ace2": false,
-        "avx512bw": false,
-        "acpi": true,
-        "hv-vapic": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "vaes": false,
-        "popcnt": true,
-        "xsaves": false,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "pclmuldq": true,
-        "x-hv-max-vps": -1,
-        "nodeid-msr": false,
-        "kvm": true,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "kvm-pv-unhalt": false,
-        "bmi2": true,
-        "bmi1": true,
-        "realized": false,
-        "tsc_scale": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "hv-vpindex": false,
-        "xlevel2": 0,
-        "clflushopt": true,
-        "kvm-no-smi-migration": false,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "lahf_lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "hv-synic": false,
-        "xstore": false,
-        "fxsr_opt": false,
-        "kvm-hint-dedicated": false,
-        "rtm": false,
-        "lmce": false,
-        "hv-time": false,
-        "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vmx": false,
-        "vme": false,
-        "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": "QEMU TCG CPU version 2.5+",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-6"
+  "id": "libvirt-4"
 }
 
 {
   "execute": "query-machines",
-  "id": "libvirt-7"
+  "id": "libvirt-5"
 }
 
 {
@@ -22999,5 +21211,5 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-5"
 }
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 354a95cebc..b16fd2b154 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -190,9 +190,6 @@
   <package>v2.12.0-rc0</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
-    <property name='phys-bits' type='number' value='0'/>
-    <property name='core-id' type='number' value='-1'/>
-    <property name='xlevel' type='number' value='2147483656'/>
     <property name='cmov' type='boolean' value='true' migratable='yes'/>
     <property name='ia64' type='boolean' value='false'/>
     <property name='aes' type='boolean' value='true' migratable='yes'/>
@@ -204,34 +201,22 @@
     <property name='xsavec' type='boolean' value='false'/>
     <property name='intel-pt' type='boolean' value='false'/>
     <property name='osxsave' type='boolean' value='false'/>
-    <property name='tsc-frequency' type='number' value='0'/>
-    <property name='xd' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-vendor-id' type='string' value=''/>
     <property name='kvm-asyncpf' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm_asyncpf' type='boolean' value='true' migratable='yes'/>
-    <property name='perfctr_core' type='boolean' value='false'/>
     <property name='perfctr-core' type='boolean' value='false'/>
     <property name='mpx' type='boolean' value='false'/>
     <property name='pbe' type='boolean' value='false'/>
-    <property name='decodeassists' type='boolean' value='false'/>
     <property name='avx512cd' type='boolean' value='false'/>
-    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
+    <property name='decodeassists' type='boolean' value='false'/>
     <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
     <property name='family' type='number' value='6'/>
-    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
     <property name='avx512f' type='boolean' value='false'/>
     <property name='msr' type='boolean' value='true' migratable='yes'/>
     <property name='mce' type='boolean' value='true' migratable='yes'/>
     <property name='mca' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-runtime' type='boolean' value='false'/>
     <property name='xcrypt' type='boolean' value='false'/>
-    <property name='thread-id' type='number' value='-1'/>
     <property name='min-level' type='number' value='13'/>
     <property name='xgetbv1' type='boolean' value='false'/>
     <property name='cid' type='boolean' value='false'/>
-    <property name='hv-relaxed' type='boolean' value='false'/>
-    <property name='hv-crash' type='boolean' value='false'/>
     <property name='ds' type='boolean' value='false'/>
     <property name='fxsr' type='boolean' value='true' migratable='yes'/>
     <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
@@ -243,83 +228,60 @@
     <property name='3dnowprefetch' type='boolean' value='false'/>
     <property name='avx512vbmi2' type='boolean' value='false'/>
     <property name='cr8legacy' type='boolean' value='false'/>
-    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
     <property name='xcrypt-en' type='boolean' value='false'/>
-    <property name='kvm_pv_eoi' type='boolean' value='true' migratable='yes'/>
-    <property name='apic-id' type='number' value='4294967295'/>
     <property name='pn' type='boolean' value='false'/>
     <property name='dca' type='boolean' value='false'/>
     <property name='vendor' type='string' value='GenuineIntel'/>
     <property name='pku' type='boolean' value='false'/>
     <property name='smx' type='boolean' value='false'/>
-    <property name='cmp_legacy' type='boolean' value='false'/>
     <property name='cmp-legacy' type='boolean' value='false'/>
-    <property name='node-id' type='number' value='-1'/>
     <property name='avx512-4fmaps' type='boolean' value='false'/>
-    <property name='vmcb_clean' type='boolean' value='false'/>
     <property name='vmcb-clean' type='boolean' value='false'/>
-    <property name='3dnowext' type='boolean' value='false'/>
     <property name='hle' type='boolean' value='false'/>
+    <property name='3dnowext' type='boolean' value='false'/>
     <property name='npt' type='boolean' value='false'/>
-    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
     <property name='clwb' type='boolean' value='false'/>
     <property name='lbrv' type='boolean' value='false'/>
     <property name='adx' type='boolean' value='false'/>
     <property name='ss' type='boolean' value='true' migratable='yes'/>
     <property name='pni' type='boolean' value='true' migratable='yes'/>
-    <property name='svm_lock' type='boolean' value='false'/>
     <property name='svm-lock' type='boolean' value='false'/>
-    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='smep' type='boolean' value='true' migratable='yes'/>
     <property name='smap' type='boolean' value='false'/>
+    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='x2apic' type='boolean' value='true' migratable='yes'/>
     <property name='avx512vbmi' type='boolean' value='false'/>
     <property name='avx512vnni' type='boolean' value='false'/>
-    <property name='hv-stimer' type='boolean' value='false'/>
-    <property name='i64' type='boolean' value='true' migratable='yes'/>
     <property name='flushbyasid' type='boolean' value='false'/>
     <property name='f16c' type='boolean' value='true' migratable='yes'/>
     <property name='ace2-en' type='boolean' value='false'/>
-    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='pae' type='boolean' value='true' migratable='yes'/>
+    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='sse' type='boolean' value='true' migratable='yes'/>
     <property name='phe-en' type='boolean' value='false'/>
-    <property name='kvm_nopiodelay' type='boolean' value='true' migratable='yes'/>
     <property name='kvm-nopiodelay' type='boolean' value='true' migratable='yes'/>
     <property name='tm' type='boolean' value='false'/>
     <property name='kvmclock-stable-bit' type='boolean' value='true' migratable='yes'/>
     <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-    <property name='socket-id' type='number' value='-1'/>
     <property name='pcommit' type='boolean' value='false'/>
     <property name='syscall' type='boolean' value='true' migratable='yes'/>
-    <property name='level' type='number' value='13'/>
     <property name='avx512dq' type='boolean' value='false'/>
     <property name='svm' type='boolean' value='false'/>
-    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-reset' type='boolean' value='false'/>
     <property name='invtsc' type='boolean' value='true' migratable='no'/>
-    <property name='sse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse2' type='boolean' value='true' migratable='yes'/>
     <property name='est' type='boolean' value='false'/>
     <property name='avx512ifma' type='boolean' value='false'/>
     <property name='tm2' type='boolean' value='false'/>
     <property name='kvm-pv-eoi' type='boolean' value='true' migratable='yes'/>
     <property name='cx8' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm_mmu' type='boolean' value='false'/>
     <property name='kvm-mmu' type='boolean' value='false'/>
-    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
     <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
     <property name='pge' type='boolean' value='true' migratable='yes'/>
-    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
     <property name='avx512bitalg' type='boolean' value='false'/>
-    <property name='nodeid_msr' type='boolean' value='false'/>
     <property name='pdcm' type='boolean' value='false'/>
-    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='model' type='number' value='63'/>
-    <property name='nrip_save' type='boolean' value='false'/>
+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='nrip-save' type='boolean' value='false'/>
-    <property name='kvm_pv_unhalt' type='boolean' value='true' migratable='yes'/>
     <property name='ssse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse4a' type='boolean' value='false'/>
     <property name='invpcid' type='boolean' value='true' migratable='yes'/>
@@ -328,7 +290,6 @@
     <property name='fma' type='boolean' value='true' migratable='yes'/>
     <property name='cx16' type='boolean' value='true' migratable='yes'/>
     <property name='de' type='boolean' value='true' migratable='yes'/>
-    <property name='enforce' type='boolean' value='false'/>
     <property name='stepping' type='number' value='2'/>
     <property name='xsave' type='boolean' value='true' migratable='yes'/>
     <property name='clflush' type='boolean' value='true' migratable='yes'/>
@@ -336,66 +297,47 @@
     <property name='tsc' type='boolean' value='true' migratable='yes'/>
     <property name='tce' type='boolean' value='false'/>
     <property name='fpu' type='boolean' value='true' migratable='yes'/>
-    <property name='ibs' type='boolean' value='false'/>
-    <property name='ds_cpl' type='boolean' value='false'/>
     <property name='ds-cpl' type='boolean' value='false'/>
-    <property name='host-phys-bits' type='boolean' value='false'/>
+    <property name='ibs' type='boolean' value='false'/>
     <property name='fma4' type='boolean' value='false'/>
     <property name='la57' type='boolean' value='false'/>
     <property name='osvw' type='boolean' value='false'/>
-    <property name='check' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-spinlocks' type='number' value='-1'/>
-    <property name='pmu' type='boolean' value='false'/>
-    <property name='pmm' type='boolean' value='false'/>
     <property name='apic' type='boolean' value='true' migratable='yes'/>
+    <property name='pmm' type='boolean' value='false'/>
     <property name='spec-ctrl' type='boolean' value='false'/>
-    <property name='min-xlevel2' type='number' value='0'/>
     <property name='tsc-adjust' type='boolean' value='true' migratable='yes'/>
-    <property name='tsc_adjust' type='boolean' value='true' migratable='yes'/>
     <property name='kvm-steal-time' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm_steal_time' type='boolean' value='true' migratable='yes'/>
     <property name='kvmclock' type='boolean' value='true' migratable='yes'/>
-    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
     <property name='lwp' type='boolean' value='false'/>
-    <property name='ibpb' type='boolean' value='false'/>
     <property name='xop' type='boolean' value='false'/>
+    <property name='ibpb' type='boolean' value='false'/>
     <property name='avx' type='boolean' value='true' migratable='yes'/>
     <property name='ospke' type='boolean' value='false'/>
-    <property name='ace2' type='boolean' value='false'/>
-    <property name='avx512bw' type='boolean' value='false'/>
     <property name='acpi' type='boolean' value='false'/>
-    <property name='hv-vapic' type='boolean' value='false'/>
+    <property name='avx512bw' type='boolean' value='false'/>
+    <property name='ace2' type='boolean' value='false'/>
     <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
     <property name='ht' type='boolean' value='false'/>
     <property name='nx' type='boolean' value='true' migratable='yes'/>
     <property name='pclmulqdq' type='boolean' value='true' migratable='yes'/>
     <property name='mmxext' type='boolean' value='false'/>
-    <property name='vaes' type='boolean' value='false'/>
     <property name='popcnt' type='boolean' value='true' migratable='yes'/>
+    <property name='vaes' type='boolean' value='false'/>
     <property name='xsaves' type='boolean' value='false'/>
-    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
     <property name='lm' type='boolean' value='true' migratable='yes'/>
     <property name='umip' type='boolean' value='false'/>
     <property name='pse' type='boolean' value='true' migratable='yes'/>
     <property name='avx2' type='boolean' value='true' migratable='yes'/>
     <property name='sep' type='boolean' value='true' migratable='yes'/>
-    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
-    <property name='x-hv-max-vps' type='number' value='-1'/>
     <property name='nodeid-msr' type='boolean' value='false'/>
-    <property name='kvm' type='boolean' value='true' migratable='yes'/>
     <property name='misalignsse' type='boolean' value='false'/>
     <property name='min-xlevel' type='number' value='2147483656'/>
-    <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/>
-    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
     <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-    <property name='realized' type='boolean' value='false'/>
-    <property name='tsc_scale' type='boolean' value='false'/>
+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/>
     <property name='tsc-scale' type='boolean' value='false'/>
     <property name='topoext' type='boolean' value='false'/>
-    <property name='hv-vpindex' type='boolean' value='false'/>
-    <property name='xlevel2' type='number' value='0'/>
     <property name='clflushopt' type='boolean' value='false'/>
-    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
     <property name='monitor' type='boolean' value='false'/>
     <property name='avx512er' type='boolean' value='false'/>
     <property name='pmm-en' type='boolean' value='false'/>
@@ -403,24 +345,18 @@
     <property name='3dnow' type='boolean' value='false'/>
     <property name='erms' type='boolean' value='true' migratable='yes'/>
     <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
     <property name='vpclmulqdq' type='boolean' value='false'/>
     <property name='fxsr-opt' type='boolean' value='false'/>
-    <property name='hv-synic' type='boolean' value='false'/>
     <property name='xstore' type='boolean' value='false'/>
-    <property name='fxsr_opt' type='boolean' value='false'/>
-    <property name='kvm-hint-dedicated' type='boolean' value='true' migratable='yes'/>
     <property name='rtm' type='boolean' value='false'/>
+    <property name='kvm-hint-dedicated' type='boolean' value='true' migratable='yes'/>
     <property name='lmce' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-time' type='boolean' value='false'/>
     <property name='perfctr-nb' type='boolean' value='false'/>
-    <property name='perfctr_nb' type='boolean' value='false'/>
-    <property name='ffxsr' type='boolean' value='false'/>
     <property name='rdrand' type='boolean' value='true' migratable='yes'/>
     <property name='rdseed' type='boolean' value='false'/>
     <property name='avx512-4vnniw' type='boolean' value='false'/>
-    <property name='vmx' type='boolean' value='false'/>
     <property name='vme' type='boolean' value='true' migratable='yes'/>
+    <property name='vmx' type='boolean' value='false'/>
     <property name='dtes64' type='boolean' value='false'/>
     <property name='mtrr' type='boolean' value='true' migratable='yes'/>
     <property name='rdtscp' type='boolean' value='true' migratable='yes'/>
@@ -428,9 +364,8 @@
     <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
     <property name='tbm' type='boolean' value='false'/>
     <property name='wdt' type='boolean' value='false'/>
-    <property name='pause_filter' type='boolean' value='false'/>
-    <property name='sha-ni' type='boolean' value='false'/>
     <property name='model-id' type='string' value='Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz'/>
+    <property name='sha-ni' type='boolean' value='false'/>
     <property name='abm' type='boolean' value='true' migratable='yes'/>
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
@@ -688,9 +623,6 @@
   <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
   <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
   <hostCPU type='tcg' model='base' migratability='yes'>
-    <property name='phys-bits' type='number' value='0'/>
-    <property name='core-id' type='number' value='-1'/>
-    <property name='xlevel' type='number' value='2147483658'/>
     <property name='cmov' type='boolean' value='true' migratable='yes'/>
     <property name='ia64' type='boolean' value='false'/>
     <property name='aes' type='boolean' value='true' migratable='yes'/>
@@ -702,34 +634,22 @@
     <property name='xsavec' type='boolean' value='false'/>
     <property name='intel-pt' type='boolean' value='false'/>
     <property name='osxsave' type='boolean' value='false'/>
-    <property name='tsc-frequency' type='number' value='0'/>
-    <property name='xd' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-vendor-id' type='string' value=''/>
     <property name='kvm-asyncpf' type='boolean' value='false'/>
-    <property name='kvm_asyncpf' type='boolean' value='false'/>
-    <property name='perfctr_core' type='boolean' value='false'/>
     <property name='perfctr-core' type='boolean' value='false'/>
     <property name='mpx' type='boolean' value='true' migratable='yes'/>
     <property name='pbe' type='boolean' value='false'/>
-    <property name='decodeassists' type='boolean' value='false'/>
     <property name='avx512cd' type='boolean' value='false'/>
-    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
+    <property name='decodeassists' type='boolean' value='false'/>
     <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
     <property name='family' type='number' value='6'/>
-    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
     <property name='avx512f' type='boolean' value='false'/>
     <property name='msr' type='boolean' value='true' migratable='yes'/>
     <property name='mce' type='boolean' value='true' migratable='yes'/>
     <property name='mca' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-runtime' type='boolean' value='false'/>
     <property name='xcrypt' type='boolean' value='false'/>
-    <property name='thread-id' type='number' value='-1'/>
     <property name='min-level' type='number' value='13'/>
     <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
     <property name='cid' type='boolean' value='false'/>
-    <property name='hv-relaxed' type='boolean' value='false'/>
-    <property name='hv-crash' type='boolean' value='false'/>
     <property name='ds' type='boolean' value='false'/>
     <property name='fxsr' type='boolean' value='true' migratable='yes'/>
     <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
@@ -741,83 +661,60 @@
     <property name='3dnowprefetch' type='boolean' value='false'/>
     <property name='avx512vbmi2' type='boolean' value='false'/>
     <property name='cr8legacy' type='boolean' value='true' migratable='yes'/>
-    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
     <property name='xcrypt-en' type='boolean' value='false'/>
-    <property name='kvm_pv_eoi' type='boolean' value='false'/>
-    <property name='apic-id' type='number' value='4294967295'/>
     <property name='pn' type='boolean' value='false'/>
     <property name='dca' type='boolean' value='false'/>
     <property name='vendor' type='string' value='AuthenticAMD'/>
     <property name='pku' type='boolean' value='true' migratable='yes'/>
     <property name='smx' type='boolean' value='false'/>
-    <property name='cmp_legacy' type='boolean' value='false'/>
     <property name='cmp-legacy' type='boolean' value='false'/>
-    <property name='node-id' type='number' value='-1'/>
     <property name='avx512-4fmaps' type='boolean' value='false'/>
-    <property name='vmcb_clean' type='boolean' value='false'/>
     <property name='vmcb-clean' type='boolean' value='false'/>
-    <property name='3dnowext' type='boolean' value='true' migratable='yes'/>
     <property name='hle' type='boolean' value='false'/>
+    <property name='3dnowext' type='boolean' value='true' migratable='yes'/>
     <property name='npt' type='boolean' value='false'/>
-    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
     <property name='clwb' type='boolean' value='true' migratable='yes'/>
     <property name='lbrv' type='boolean' value='false'/>
     <property name='adx' type='boolean' value='true' migratable='yes'/>
     <property name='ss' type='boolean' value='true' migratable='yes'/>
     <property name='pni' type='boolean' value='true' migratable='yes'/>
-    <property name='svm_lock' type='boolean' value='false'/>
     <property name='svm-lock' type='boolean' value='false'/>
-    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='smep' type='boolean' value='true' migratable='yes'/>
     <property name='smap' type='boolean' value='true' migratable='yes'/>
+    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='x2apic' type='boolean' value='false'/>
     <property name='avx512vbmi' type='boolean' value='false'/>
     <property name='avx512vnni' type='boolean' value='false'/>
-    <property name='hv-stimer' type='boolean' value='false'/>
-    <property name='i64' type='boolean' value='true' migratable='yes'/>
     <property name='flushbyasid' type='boolean' value='false'/>
     <property name='f16c' type='boolean' value='false'/>
     <property name='ace2-en' type='boolean' value='false'/>
-    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='pae' type='boolean' value='true' migratable='yes'/>
+    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='sse' type='boolean' value='true' migratable='yes'/>
     <property name='phe-en' type='boolean' value='false'/>
-    <property name='kvm_nopiodelay' type='boolean' value='false'/>
     <property name='kvm-nopiodelay' type='boolean' value='false'/>
     <property name='tm' type='boolean' value='false'/>
     <property name='kvmclock-stable-bit' type='boolean' value='false'/>
     <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-    <property name='socket-id' type='number' value='-1'/>
     <property name='pcommit' type='boolean' value='true' migratable='yes'/>
     <property name='syscall' type='boolean' value='true' migratable='yes'/>
-    <property name='level' type='number' value='13'/>
     <property name='avx512dq' type='boolean' value='false'/>
     <property name='svm' type='boolean' value='true' migratable='yes'/>
-    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-reset' type='boolean' value='false'/>
     <property name='invtsc' type='boolean' value='false'/>
-    <property name='sse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse2' type='boolean' value='true' migratable='yes'/>
     <property name='est' type='boolean' value='false'/>
     <property name='avx512ifma' type='boolean' value='false'/>
     <property name='tm2' type='boolean' value='false'/>
     <property name='kvm-pv-eoi' type='boolean' value='false'/>
     <property name='cx8' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm_mmu' type='boolean' value='false'/>
     <property name='kvm-mmu' type='boolean' value='false'/>
-    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
     <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
     <property name='pge' type='boolean' value='true' migratable='yes'/>
-    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
     <property name='avx512bitalg' type='boolean' value='false'/>
-    <property name='nodeid_msr' type='boolean' value='false'/>
     <property name='pdcm' type='boolean' value='false'/>
-    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='model' type='number' value='6'/>
-    <property name='nrip_save' type='boolean' value='false'/>
+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='nrip-save' type='boolean' value='false'/>
-    <property name='kvm_pv_unhalt' type='boolean' value='false'/>
     <property name='ssse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse4a' type='boolean' value='true' migratable='yes'/>
     <property name='invpcid' type='boolean' value='false'/>
@@ -826,7 +723,6 @@
     <property name='fma' type='boolean' value='false'/>
     <property name='cx16' type='boolean' value='true' migratable='yes'/>
     <property name='de' type='boolean' value='true' migratable='yes'/>
-    <property name='enforce' type='boolean' value='false'/>
     <property name='stepping' type='number' value='3'/>
     <property name='xsave' type='boolean' value='true' migratable='yes'/>
     <property name='clflush' type='boolean' value='true' migratable='yes'/>
@@ -834,66 +730,47 @@
     <property name='tsc' type='boolean' value='true' migratable='yes'/>
     <property name='tce' type='boolean' value='false'/>
     <property name='fpu' type='boolean' value='true' migratable='yes'/>
-    <property name='ibs' type='boolean' value='false'/>
-    <property name='ds_cpl' type='boolean' value='false'/>
     <property name='ds-cpl' type='boolean' value='false'/>
-    <property name='host-phys-bits' type='boolean' value='false'/>
+    <property name='ibs' type='boolean' value='false'/>
     <property name='fma4' type='boolean' value='false'/>
     <property name='la57' type='boolean' value='true' migratable='yes'/>
     <property name='osvw' type='boolean' value='false'/>
-    <property name='check' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-spinlocks' type='number' value='-1'/>
-    <property name='pmu' type='boolean' value='false'/>
-    <property name='pmm' type='boolean' value='false'/>
     <property name='apic' type='boolean' value='true' migratable='yes'/>
+    <property name='pmm' type='boolean' value='false'/>
     <property name='spec-ctrl' type='boolean' value='false'/>
-    <property name='min-xlevel2' type='number' value='0'/>
     <property name='tsc-adjust' type='boolean' value='false'/>
-    <property name='tsc_adjust' type='boolean' value='false'/>
     <property name='kvm-steal-time' type='boolean' value='false'/>
-    <property name='kvm_steal_time' type='boolean' value='false'/>
     <property name='kvmclock' type='boolean' value='false'/>
-    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
     <property name='lwp' type='boolean' value='false'/>
-    <property name='ibpb' type='boolean' value='false'/>
     <property name='xop' type='boolean' value='false'/>
+    <property name='ibpb' type='boolean' value='false'/>
     <property name='avx' type='boolean' value='false'/>
     <property name='ospke' type='boolean' value='true' migratable='yes'/>
-    <property name='ace2' type='boolean' value='false'/>
-    <property name='avx512bw' type='boolean' value='false'/>
     <property name='acpi' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-vapic' type='boolean' value='false'/>
+    <property name='avx512bw' type='boolean' value='false'/>
+    <property name='ace2' type='boolean' value='false'/>
     <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
     <property name='ht' type='boolean' value='false'/>
     <property name='nx' type='boolean' value='true' migratable='yes'/>
     <property name='pclmulqdq' type='boolean' value='true' migratable='yes'/>
     <property name='mmxext' type='boolean' value='true' migratable='yes'/>
-    <property name='vaes' type='boolean' value='false'/>
     <property name='popcnt' type='boolean' value='true' migratable='yes'/>
+    <property name='vaes' type='boolean' value='false'/>
     <property name='xsaves' type='boolean' value='false'/>
-    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
     <property name='lm' type='boolean' value='true' migratable='yes'/>
     <property name='umip' type='boolean' value='false'/>
     <property name='pse' type='boolean' value='true' migratable='yes'/>
     <property name='avx2' type='boolean' value='false'/>
     <property name='sep' type='boolean' value='true' migratable='yes'/>
-    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
-    <property name='x-hv-max-vps' type='number' value='-1'/>
     <property name='nodeid-msr' type='boolean' value='false'/>
-    <property name='kvm' type='boolean' value='true' migratable='yes'/>
     <property name='misalignsse' type='boolean' value='false'/>
     <property name='min-xlevel' type='number' value='2147483658'/>
-    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
-    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
     <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-    <property name='realized' type='boolean' value='false'/>
-    <property name='tsc_scale' type='boolean' value='false'/>
+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
     <property name='tsc-scale' type='boolean' value='false'/>
     <property name='topoext' type='boolean' value='false'/>
-    <property name='hv-vpindex' type='boolean' value='false'/>
-    <property name='xlevel2' type='number' value='0'/>
     <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
     <property name='monitor' type='boolean' value='true' migratable='yes'/>
     <property name='avx512er' type='boolean' value='false'/>
     <property name='pmm-en' type='boolean' value='false'/>
@@ -901,24 +778,18 @@
     <property name='3dnow' type='boolean' value='true' migratable='yes'/>
     <property name='erms' type='boolean' value='true' migratable='yes'/>
     <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
     <property name='vpclmulqdq' type='boolean' value='false'/>
     <property name='fxsr-opt' type='boolean' value='false'/>
-    <property name='hv-synic' type='boolean' value='false'/>
     <property name='xstore' type='boolean' value='false'/>
-    <property name='fxsr_opt' type='boolean' value='false'/>
-    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
     <property name='rtm' type='boolean' value='false'/>
+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
     <property name='lmce' type='boolean' value='false'/>
-    <property name='hv-time' type='boolean' value='false'/>
     <property name='perfctr-nb' type='boolean' value='false'/>
-    <property name='perfctr_nb' type='boolean' value='false'/>
-    <property name='ffxsr' type='boolean' value='false'/>
     <property name='rdrand' type='boolean' value='false'/>
     <property name='rdseed' type='boolean' value='false'/>
     <property name='avx512-4vnniw' type='boolean' value='false'/>
-    <property name='vmx' type='boolean' value='false'/>
     <property name='vme' type='boolean' value='false'/>
+    <property name='vmx' type='boolean' value='false'/>
     <property name='dtes64' type='boolean' value='false'/>
     <property name='mtrr' type='boolean' value='true' migratable='yes'/>
     <property name='rdtscp' type='boolean' value='true' migratable='yes'/>
@@ -926,9 +797,8 @@
     <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
     <property name='tbm' type='boolean' value='false'/>
     <property name='wdt' type='boolean' value='false'/>
-    <property name='pause_filter' type='boolean' value='false'/>
-    <property name='sha-ni' type='boolean' value='false'/>
     <property name='model-id' type='string' value='QEMU TCG CPU version 2.5+'/>
+    <property name='sha-ni' type='boolean' value='false'/>
     <property name='abm' type='boolean' value='true' migratable='yes'/>
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
index a63d1d8118..6a4164ff1a 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
@@ -20428,7 +20428,19 @@
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
-    "type": "full",
+    "type": "static",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false
+      }
+    }
+  },
+  "id": "libvirt-49"
+}
+
+{
+  "return": {
     "model": {
       "name": "base",
       "props": {
@@ -20509,7 +20521,7 @@
         "syscall": true,
         "avx512dq": false,
         "svm": false,
-        "invtsc": false,
+        "invtsc": true,
         "sse2": true,
         "ssbd": false,
         "est": false,
@@ -20620,2223 +20632,633 @@
   "id": "libvirt-49"
 }
 
+{
+  "execute": "qmp_capabilities",
+  "id": "libvirt-1"
+}
+
 {
   "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": true,
-        "intel-pt": false,
-        "hv-frequencies": 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,
-        "decodeassists": false,
-        "avx512cd": false,
-        "sse4_1": true,
-        "sse4.1": true,
-        "sse4-1": true,
-        "family": 6,
-        "legacy-cache": true,
-        "vmware-cpuid-freq": true,
-        "avx512f": false,
-        "msr": true,
-        "mce": true,
-        "mca": true,
-        "hv-runtime": false,
-        "xcrypt": false,
-        "thread-id": -1,
-        "min-level": 13,
-        "xgetbv1": true,
-        "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": true,
-        "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,
-        "amd-no-ssb": 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,
-        "pfthreshold": false,
-        "smep": true,
-        "smap": true,
-        "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,
-        "x-migrate-smi-count": true,
-        "svm": false,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
-        "invtsc": false,
-        "sse3": true,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": true,
-        "cx8": true,
-        "cldemote": false,
-        "hv-reenlightenment": false,
-        "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": 94,
-        "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": 3,
-        "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": true,
-        "min-xlevel2": 0,
-        "tsc-adjust": true,
-        "tsc_adjust": true,
-        "kvm-steal-time": true,
-        "kvm_steal_time": true,
-        "kvmclock": true,
-        "l3-cache": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "ibpb": false,
-        "xop": false,
-        "avx": true,
-        "ace2": false,
-        "avx512bw": false,
-        "acpi": false,
-        "hv-vapic": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": false,
-        "vaes": false,
-        "popcnt": true,
-        "xsaves": true,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": true,
-        "pse": true,
-        "avx2": true,
-        "sep": true,
-        "pclmuldq": true,
-        "virt-ssbd": false,
-        "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": true,
-        "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,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "hv-synic": false,
-        "xstore": false,
-        "fxsr_opt": false,
-        "kvm-hint-dedicated": false,
-        "rtm": true,
-        "lmce": true,
-        "hv-time": false,
-        "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
-        "hv-tlbflush": false,
-        "rdrand": true,
-        "rdseed": true,
-        "avx512-4vnniw": false,
-        "vmx": true,
-        "vme": true,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": true,
-        "tbm": false,
-        "wdt": false,
-        "pause_filter": false,
-        "sha-ni": false,
-        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-1"
 }
 
 {
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "host",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-50"
+  "execute": "query-cpu-definitions",
+  "id": "libvirt-2"
 }
 
 {
-  "return": {
-    "model": {
+  "return": [
+    {
+      "name": "max",
+      "typename": "max-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": false
+    },
+    {
+      "name": "host",
+      "typename": "host-x86_64-cpu",
+      "unavailable-features": [
+        "kvm"
+      ],
+      "static": false,
+      "migration-safe": false
+    },
+    {
       "name": "base",
-      "props": {
-        "cmov": true,
-        "ia64": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "pause-filter": false,
-        "xsavec": true,
-        "intel-pt": 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,
-        "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": true,
-        "3dnowext": false,
-        "amd-no-ssb": 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,
-        "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": true,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": true,
-        "cx8": true,
-        "cldemote": false,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "avx512bitalg": false,
-        "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,
-        "spec-ctrl": true,
-        "tsc-adjust": true,
-        "kvm-steal-time": true,
-        "kvmclock": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "xop": false,
-        "ibpb": false,
-        "avx": true,
-        "acpi": false,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": false,
-        "popcnt": true,
-        "vaes": false,
-        "xsaves": true,
-        "lm": true,
-        "umip": true,
-        "pse": true,
-        "avx2": true,
-        "sep": true,
-        "virt-ssbd": false,
-        "nodeid-msr": false,
-        "misalignsse": false,
-        "min-xlevel": 2147483656,
-        "bmi1": true,
-        "bmi2": true,
-        "kvm-pv-unhalt": true,
-        "tsc-scale": false,
-        "topoext": true,
-        "clflushopt": true,
-        "monitor": false,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": true,
-        "3dnow": false,
-        "erms": true,
-        "lahf-lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": true,
-        "kvm-hint-dedicated": false,
-        "lmce": true,
-        "perfctr-nb": false,
-        "rdrand": true,
-        "rdseed": true,
-        "avx512-4vnniw": false,
-        "vme": true,
-        "vmx": true,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": 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-50"
-}
-
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "full",
-    "model": {
-      "name": "base",
-      "props": {
-        "cmov": true,
-        "ia64": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "pause-filter": false,
-        "xsavec": true,
-        "intel-pt": 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,
-        "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": true,
-        "3dnowext": false,
-        "amd-no-ssb": 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,
-        "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": true,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": true,
-        "cx8": true,
-        "cldemote": false,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "avx512bitalg": false,
-        "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,
-        "spec-ctrl": true,
-        "tsc-adjust": true,
-        "kvm-steal-time": true,
-        "kvmclock": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "xop": false,
-        "ibpb": false,
-        "avx": true,
-        "acpi": false,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": false,
-        "popcnt": true,
-        "vaes": false,
-        "xsaves": true,
-        "lm": true,
-        "umip": true,
-        "pse": true,
-        "avx2": true,
-        "sep": true,
-        "virt-ssbd": false,
-        "nodeid-msr": false,
-        "misalignsse": false,
-        "min-xlevel": 2147483656,
-        "bmi1": true,
-        "bmi2": true,
-        "kvm-pv-unhalt": true,
-        "tsc-scale": false,
-        "topoext": true,
-        "clflushopt": true,
-        "monitor": false,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": true,
-        "3dnow": false,
-        "erms": true,
-        "lahf-lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": true,
-        "kvm-hint-dedicated": false,
-        "lmce": true,
-        "perfctr-nb": false,
-        "rdrand": true,
-        "rdseed": true,
-        "avx512-4vnniw": false,
-        "vme": true,
-        "vmx": true,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": 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-51"
-}
-
-{
-  "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": true,
-        "intel-pt": false,
-        "hv-frequencies": 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,
-        "decodeassists": false,
-        "avx512cd": false,
-        "sse4_1": true,
-        "sse4.1": true,
-        "sse4-1": true,
-        "family": 6,
-        "legacy-cache": true,
-        "vmware-cpuid-freq": true,
-        "avx512f": false,
-        "msr": true,
-        "mce": true,
-        "mca": true,
-        "hv-runtime": false,
-        "xcrypt": false,
-        "thread-id": -1,
-        "min-level": 13,
-        "xgetbv1": true,
-        "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": true,
-        "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,
-        "amd-no-ssb": 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,
-        "pfthreshold": false,
-        "smep": true,
-        "smap": true,
-        "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,
-        "x-migrate-smi-count": true,
-        "svm": false,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
-        "invtsc": true,
-        "sse3": true,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": true,
-        "cx8": true,
-        "cldemote": false,
-        "hv-reenlightenment": false,
-        "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": 94,
-        "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": 3,
-        "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": true,
-        "min-xlevel2": 0,
-        "tsc-adjust": true,
-        "tsc_adjust": true,
-        "kvm-steal-time": true,
-        "kvm_steal_time": true,
-        "kvmclock": true,
-        "l3-cache": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "ibpb": false,
-        "xop": false,
-        "avx": true,
-        "ace2": false,
-        "avx512bw": false,
-        "acpi": false,
-        "hv-vapic": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": false,
-        "vaes": false,
-        "popcnt": true,
-        "xsaves": true,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": true,
-        "pse": true,
-        "avx2": true,
-        "sep": true,
-        "pclmuldq": true,
-        "virt-ssbd": false,
-        "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": true,
-        "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,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "hv-synic": false,
-        "xstore": false,
-        "fxsr_opt": false,
-        "kvm-hint-dedicated": false,
-        "rtm": true,
-        "lmce": true,
-        "hv-time": false,
-        "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
-        "hv-tlbflush": false,
-        "rdrand": true,
-        "rdseed": true,
-        "avx512-4vnniw": false,
-        "vmx": true,
-        "vme": true,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": true,
-        "tbm": false,
-        "wdt": false,
-        "pause_filter": false,
-        "sha-ni": false,
-        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-51"
-}
-
-{
-  "execute": "qmp_capabilities",
-  "id": "libvirt-1"
-}
-
-{
-  "return": {
-  },
-  "id": "libvirt-1"
-}
-
-{
-  "execute": "query-cpu-definitions",
-  "id": "libvirt-2"
-}
-
-{
-  "return": [
-    {
-      "name": "max",
-      "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": false
-    },
-    {
-      "name": "host",
-      "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-        "kvm"
-      ],
-      "static": false,
-      "migration-safe": false
-    },
-    {
-      "name": "base",
-      "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": true,
-      "migration-safe": true
-    },
-    {
-      "name": "qemu64",
-      "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "qemu32",
-      "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "phenom",
-      "typename": "phenom-x86_64-cpu",
-      "unavailable-features": [
-        "fxsr-opt"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "pentium3",
-      "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "pentium2",
-      "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "pentium",
-      "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "n270",
-      "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "kvm64",
-      "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "kvm32",
-      "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "coreduo",
-      "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "core2duo",
-      "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "athlon",
-      "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Westmere-IBRS",
-      "typename": "Westmere-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Westmere",
-      "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Server-IBRS",
-      "typename": "Skylake-Server-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "avx512f",
-        "avx512dq",
-        "rdseed",
-        "avx512cd",
-        "avx512bw",
-        "avx512vl",
-        "spec-ctrl",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Server",
-      "typename": "Skylake-Server-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "avx512f",
-        "avx512dq",
-        "rdseed",
-        "avx512cd",
-        "avx512bw",
-        "avx512vl",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Client-IBRS",
-      "typename": "Skylake-Client-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "spec-ctrl",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Client",
-      "typename": "Skylake-Client-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "SandyBridge-IBRS",
-      "typename": "SandyBridge-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "SandyBridge",
-      "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Penryn",
-      "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G5",
-      "typename": "Opteron_G5-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "avx",
-        "f16c",
-        "misalignsse",
-        "3dnowprefetch",
-        "xop",
-        "fma4",
-        "tbm"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G4",
-      "typename": "Opteron_G4-x86_64-cpu",
-      "unavailable-features": [
-        "avx",
-        "misalignsse",
-        "3dnowprefetch",
-        "xop",
-        "fma4"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G3",
-      "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-        "misalignsse"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G2",
-      "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G1",
-      "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Nehalem-IBRS",
-      "typename": "Nehalem-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Nehalem",
-      "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "KnightsMill",
-      "typename": "KnightsMill-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "avx512f",
-        "rdseed",
-        "avx512pf",
-        "avx512er",
-        "avx512cd",
-        "avx512-vpopcntdq",
-        "avx512-4vnniw",
-        "avx512-4fmaps",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "IvyBridge-IBRS",
-      "typename": "IvyBridge-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "IvyBridge",
-      "typename": "IvyBridge-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell-noTSX-IBRS",
-      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid",
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell-noTSX",
-      "typename": "Haswell-noTSX-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell-IBRS",
-      "typename": "Haswell-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell",
-      "typename": "Haswell-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "EPYC-IBPB",
-      "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "rdseed",
-        "sha-ni",
-        "fxsr-opt",
-        "misalignsse",
-        "3dnowprefetch",
-        "osvw",
-        "topoext",
-        "ibpb",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "EPYC",
-      "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "rdseed",
-        "sha-ni",
-        "fxsr-opt",
-        "misalignsse",
-        "3dnowprefetch",
-        "osvw",
-        "topoext",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Conroe",
-      "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell-noTSX-IBRS",
-      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid",
-        "rdseed",
-        "spec-ctrl",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell-noTSX",
-      "typename": "Broadwell-noTSX-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid",
-        "rdseed",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell-IBRS",
-      "typename": "Broadwell-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "spec-ctrl",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell",
-      "typename": "Broadwell-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "486",
-      "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    }
-  ],
-  "id": "libvirt-2"
-}
-
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "max"
-    }
-  },
-  "id": "libvirt-3"
-}
-
-{
-  "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,
-        "kvm-asyncpf": false,
-        "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": false,
-        "avx512vbmi2": false,
-        "cr8legacy": true,
-        "xcrypt-en": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "pku": true,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": false,
-        "3dnowext": true,
-        "amd-no-ssb": false,
-        "npt": true,
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": true,
-        "pfthreshold": false,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pae": true,
-        "pat": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "pcommit": true,
-        "syscall": true,
-        "avx512dq": false,
-        "svm": true,
-        "invtsc": false,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": false,
-        "cx8": true,
-        "cldemote": false,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "avx512bitalg": false,
-        "pdcm": false,
-        "model": 6,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "fma": false,
-        "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": true,
-        "osvw": false,
-        "apic": true,
-        "pmm": false,
-        "spec-ctrl": false,
-        "tsc-adjust": false,
-        "kvm-steal-time": false,
-        "kvmclock": false,
-        "lwp": false,
-        "amd-ssbd": false,
-        "xop": false,
-        "ibpb": false,
-        "avx": false,
-        "acpi": true,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "popcnt": true,
-        "vaes": false,
-        "xsaves": false,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "virt-ssbd": false,
-        "nodeid-msr": false,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "bmi1": true,
-        "bmi2": true,
-        "kvm-pv-unhalt": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "clflushopt": true,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": false,
-        "kvm-hint-dedicated": false,
-        "lmce": false,
-        "perfctr-nb": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vme": false,
-        "vmx": false,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": false,
-        "tbm": false,
-        "wdt": false,
-        "model-id": "QEMU TCG CPU version 2.5+",
-        "sha-ni": false,
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-3"
-}
-
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "full",
-    "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,
-        "kvm-asyncpf": false,
-        "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": false,
-        "avx512vbmi2": false,
-        "cr8legacy": true,
-        "xcrypt-en": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "pku": true,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": false,
-        "3dnowext": true,
-        "amd-no-ssb": false,
-        "npt": true,
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": true,
-        "pfthreshold": false,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pae": true,
-        "pat": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "pcommit": true,
-        "syscall": true,
-        "avx512dq": false,
-        "svm": true,
-        "invtsc": false,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": false,
-        "cx8": true,
-        "cldemote": false,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "avx512bitalg": false,
-        "pdcm": false,
-        "model": 6,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "fma": false,
-        "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": true,
-        "osvw": false,
-        "apic": true,
-        "pmm": false,
-        "spec-ctrl": false,
-        "tsc-adjust": false,
-        "kvm-steal-time": false,
-        "kvmclock": false,
-        "lwp": false,
-        "amd-ssbd": false,
-        "xop": false,
-        "ibpb": false,
-        "avx": false,
-        "acpi": true,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "popcnt": true,
-        "vaes": false,
-        "xsaves": false,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "virt-ssbd": false,
-        "nodeid-msr": false,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "bmi1": true,
-        "bmi2": true,
-        "kvm-pv-unhalt": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "clflushopt": true,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": false,
-        "kvm-hint-dedicated": false,
-        "lmce": false,
-        "perfctr-nb": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vme": false,
-        "vmx": false,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": false,
-        "tbm": false,
-        "wdt": false,
-        "model-id": "QEMU TCG CPU version 2.5+",
-        "sha-ni": false,
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-4"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483658,
-        "cmov": true,
-        "ia64": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "pause-filter": false,
-        "xsavec": false,
-        "intel-pt": false,
-        "hv-frequencies": false,
-        "tsc-frequency": 0,
-        "xd": true,
-        "hv-vendor-id": "",
-        "kvm-asyncpf": false,
-        "kvm_asyncpf": false,
-        "perfctr_core": false,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "decodeassists": false,
-        "avx512cd": false,
-        "sse4_1": true,
-        "sse4.1": true,
-        "sse4-1": true,
-        "family": 6,
-        "legacy-cache": true,
-        "vmware-cpuid-freq": true,
-        "avx512f": false,
-        "msr": true,
-        "mce": true,
-        "mca": true,
-        "hv-runtime": false,
-        "xcrypt": false,
-        "thread-id": -1,
-        "min-level": 13,
-        "xgetbv1": true,
-        "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": true,
-        "cpuid-0xb": true,
-        "xcrypt-en": false,
-        "kvm_pv_eoi": false,
-        "apic-id": 4294967295,
-        "pn": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "pku": true,
-        "smx": false,
-        "cmp_legacy": false,
-        "cmp-legacy": false,
-        "node-id": -1,
-        "avx512-4fmaps": false,
-        "vmcb_clean": false,
-        "vmcb-clean": false,
-        "3dnowext": true,
-        "amd-no-ssb": false,
-        "hle": false,
-        "npt": true,
-        "memory": "/machine/unattached/system[0]",
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm_lock": false,
-        "svm-lock": false,
-        "pfthreshold": false,
-        "smep": true,
-        "smap": true,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "hv-stimer": false,
-        "i64": true,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pat": true,
-        "pae": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm_nopiodelay": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "socket-id": -1,
-        "pcommit": true,
-        "syscall": true,
-        "level": 13,
-        "avx512dq": false,
-        "x-migrate-smi-count": true,
-        "svm": true,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
-        "invtsc": false,
-        "sse3": true,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": false,
-        "cx8": true,
-        "cldemote": false,
-        "hv-reenlightenment": false,
-        "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": 6,
-        "nrip_save": false,
-        "nrip-save": false,
-        "kvm_pv_unhalt": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "fma": false,
-        "cx16": true,
-        "de": true,
-        "enforce": false,
-        "stepping": 3,
-        "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": true,
-        "osvw": false,
-        "check": true,
-        "hv-spinlocks": -1,
-        "pmu": false,
-        "pmm": false,
-        "apic": true,
-        "spec-ctrl": false,
-        "min-xlevel2": 0,
-        "tsc-adjust": false,
-        "tsc_adjust": false,
-        "kvm-steal-time": false,
-        "kvm_steal_time": false,
-        "kvmclock": false,
-        "l3-cache": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "ibpb": false,
-        "xop": false,
-        "avx": false,
-        "ace2": false,
-        "avx512bw": false,
-        "acpi": true,
-        "hv-vapic": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "vaes": false,
-        "popcnt": true,
-        "xsaves": false,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "pclmuldq": true,
-        "virt-ssbd": false,
-        "x-hv-max-vps": -1,
-        "nodeid-msr": false,
-        "kvm": true,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "kvm-pv-unhalt": false,
-        "bmi2": true,
-        "bmi1": true,
-        "realized": false,
-        "tsc_scale": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "hv-vpindex": false,
-        "xlevel2": 0,
-        "clflushopt": true,
-        "kvm-no-smi-migration": false,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "lahf_lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "hv-synic": false,
-        "xstore": false,
-        "fxsr_opt": false,
-        "kvm-hint-dedicated": false,
-        "rtm": false,
-        "lmce": false,
-        "hv-time": false,
-        "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
-        "hv-tlbflush": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vmx": false,
-        "vme": false,
-        "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": "QEMU TCG CPU version 2.5+",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
+      "typename": "base-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "qemu64",
+      "typename": "qemu64-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "qemu32",
+      "typename": "qemu32-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "phenom",
+      "typename": "phenom-x86_64-cpu",
+      "unavailable-features": [
+        "fxsr-opt"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium3",
+      "typename": "pentium3-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium2",
+      "typename": "pentium2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium",
+      "typename": "pentium-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "n270",
+      "typename": "n270-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "kvm64",
+      "typename": "kvm64-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "kvm32",
+      "typename": "kvm32-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "coreduo",
+      "typename": "coreduo-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "core2duo",
+      "typename": "core2duo-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "athlon",
+      "typename": "athlon-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Westmere-IBRS",
+      "typename": "Westmere-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Westmere",
+      "typename": "Westmere-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Server-IBRS",
+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "spec-ctrl",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Server",
+      "typename": "Skylake-Server-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Client-IBRS",
+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "spec-ctrl",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Client",
+      "typename": "Skylake-Client-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "SandyBridge-IBRS",
+      "typename": "SandyBridge-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "SandyBridge",
+      "typename": "SandyBridge-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Penryn",
+      "typename": "Penryn-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G5",
+      "typename": "Opteron_G5-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "misalignsse",
+        "3dnowprefetch",
+        "xop",
+        "fma4",
+        "tbm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G4",
+      "typename": "Opteron_G4-x86_64-cpu",
+      "unavailable-features": [
+        "avx",
+        "misalignsse",
+        "3dnowprefetch",
+        "xop",
+        "fma4"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G3",
+      "typename": "Opteron_G3-x86_64-cpu",
+      "unavailable-features": [
+        "misalignsse"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G2",
+      "typename": "Opteron_G2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G1",
+      "typename": "Opteron_G1-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Nehalem-IBRS",
+      "typename": "Nehalem-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Nehalem",
+      "typename": "Nehalem-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "KnightsMill",
+      "typename": "KnightsMill-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "avx512f",
+        "rdseed",
+        "avx512pf",
+        "avx512er",
+        "avx512cd",
+        "avx512-vpopcntdq",
+        "avx512-4vnniw",
+        "avx512-4fmaps",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "IvyBridge-IBRS",
+      "typename": "IvyBridge-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "IvyBridge",
+      "typename": "IvyBridge-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-noTSX-IBRS",
+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-noTSX",
+      "typename": "Haswell-noTSX-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-IBRS",
+      "typename": "Haswell-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell",
+      "typename": "Haswell-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "EPYC-IBPB",
+      "typename": "EPYC-IBPB-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "rdseed",
+        "sha-ni",
+        "fxsr-opt",
+        "misalignsse",
+        "3dnowprefetch",
+        "osvw",
+        "topoext",
+        "ibpb",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "EPYC",
+      "typename": "EPYC-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "rdseed",
+        "sha-ni",
+        "fxsr-opt",
+        "misalignsse",
+        "3dnowprefetch",
+        "osvw",
+        "topoext",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Conroe",
+      "typename": "Conroe-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-noTSX-IBRS",
+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid",
+        "rdseed",
+        "spec-ctrl",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-noTSX",
+      "typename": "Broadwell-noTSX-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid",
+        "rdseed",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-IBRS",
+      "typename": "Broadwell-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "spec-ctrl",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell",
+      "typename": "Broadwell-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "486",
+      "typename": "486-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
     }
-  },
-  "id": "libvirt-4"
+  ],
+  "id": "libvirt-2"
 }
 
 {
@@ -22844,13 +21266,10 @@
   "arguments": {
     "type": "static",
     "model": {
-      "name": "max",
-      "props": {
-        "migratable": false
-      }
+      "name": "max"
     }
   },
-  "id": "libvirt-5"
+  "id": "libvirt-3"
 }
 
 {
@@ -23043,13 +21462,25 @@
       }
     }
   },
-  "id": "libvirt-5"
+  "id": "libvirt-3"
 }
 
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
-    "type": "full",
+    "type": "static",
+    "model": {
+      "name": "max",
+      "props": {
+        "migratable": false
+      }
+    }
+  },
+  "id": "libvirt-4"
+}
+
+{
+  "return": {
     "model": {
       "name": "base",
       "props": {
@@ -23238,275 +21669,12 @@
       }
     }
   },
-  "id": "libvirt-6"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483658,
-        "cmov": true,
-        "ia64": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "pause-filter": false,
-        "xsavec": false,
-        "intel-pt": false,
-        "hv-frequencies": false,
-        "tsc-frequency": 0,
-        "xd": true,
-        "hv-vendor-id": "",
-        "kvm-asyncpf": false,
-        "kvm_asyncpf": false,
-        "perfctr_core": false,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "decodeassists": false,
-        "avx512cd": false,
-        "sse4_1": true,
-        "sse4.1": true,
-        "sse4-1": true,
-        "family": 6,
-        "legacy-cache": true,
-        "vmware-cpuid-freq": true,
-        "avx512f": false,
-        "msr": true,
-        "mce": true,
-        "mca": true,
-        "hv-runtime": false,
-        "xcrypt": false,
-        "thread-id": -1,
-        "min-level": 13,
-        "xgetbv1": true,
-        "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": true,
-        "cpuid-0xb": true,
-        "xcrypt-en": false,
-        "kvm_pv_eoi": false,
-        "apic-id": 4294967295,
-        "pn": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "pku": true,
-        "smx": false,
-        "cmp_legacy": false,
-        "cmp-legacy": false,
-        "node-id": -1,
-        "avx512-4fmaps": false,
-        "vmcb_clean": false,
-        "vmcb-clean": false,
-        "3dnowext": true,
-        "amd-no-ssb": false,
-        "hle": false,
-        "npt": true,
-        "memory": "/machine/unattached/system[0]",
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm_lock": false,
-        "svm-lock": false,
-        "pfthreshold": false,
-        "smep": true,
-        "smap": true,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "hv-stimer": false,
-        "i64": true,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pat": true,
-        "pae": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm_nopiodelay": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "socket-id": -1,
-        "pcommit": true,
-        "syscall": true,
-        "level": 13,
-        "avx512dq": false,
-        "x-migrate-smi-count": true,
-        "svm": true,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
-        "invtsc": false,
-        "sse3": true,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": false,
-        "cx8": true,
-        "cldemote": false,
-        "hv-reenlightenment": false,
-        "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": 6,
-        "nrip_save": false,
-        "nrip-save": false,
-        "kvm_pv_unhalt": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "fma": false,
-        "cx16": true,
-        "de": true,
-        "enforce": false,
-        "stepping": 3,
-        "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": true,
-        "osvw": false,
-        "check": true,
-        "hv-spinlocks": -1,
-        "pmu": false,
-        "pmm": false,
-        "apic": true,
-        "spec-ctrl": false,
-        "min-xlevel2": 0,
-        "tsc-adjust": false,
-        "tsc_adjust": false,
-        "kvm-steal-time": false,
-        "kvm_steal_time": false,
-        "kvmclock": false,
-        "l3-cache": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "ibpb": false,
-        "xop": false,
-        "avx": false,
-        "ace2": false,
-        "avx512bw": false,
-        "acpi": true,
-        "hv-vapic": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "vaes": false,
-        "popcnt": true,
-        "xsaves": false,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "pclmuldq": true,
-        "virt-ssbd": false,
-        "x-hv-max-vps": -1,
-        "nodeid-msr": false,
-        "kvm": true,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "kvm-pv-unhalt": false,
-        "bmi2": true,
-        "bmi1": true,
-        "realized": false,
-        "tsc_scale": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "hv-vpindex": false,
-        "xlevel2": 0,
-        "clflushopt": true,
-        "kvm-no-smi-migration": false,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "lahf_lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "hv-synic": false,
-        "xstore": false,
-        "fxsr_opt": false,
-        "kvm-hint-dedicated": false,
-        "rtm": false,
-        "lmce": false,
-        "hv-time": false,
-        "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
-        "hv-tlbflush": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vmx": false,
-        "vme": false,
-        "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": "QEMU TCG CPU version 2.5+",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-6"
+  "id": "libvirt-4"
 }
 
 {
   "execute": "query-machines",
-  "id": "libvirt-7"
+  "id": "libvirt-5"
 }
 
 {
@@ -23715,5 +21883,5 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-5"
 }
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index cffe482bf6..6938606f3c 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -196,9 +196,6 @@
   <package>v3.0.0</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
-    <property name='phys-bits' type='number' value='0'/>
-    <property name='core-id' type='number' value='-1'/>
-    <property name='xlevel' type='number' value='2147483656'/>
     <property name='cmov' type='boolean' value='true' migratable='yes'/>
     <property name='ia64' type='boolean' value='false'/>
     <property name='aes' type='boolean' value='true' migratable='yes'/>
@@ -209,36 +206,22 @@
     <property name='pause-filter' type='boolean' value='false'/>
     <property name='xsavec' type='boolean' value='true' migratable='yes'/>
     <property name='intel-pt' type='boolean' value='false'/>
-    <property name='hv-frequencies' type='boolean' value='false'/>
-    <property name='tsc-frequency' type='number' value='0'/>
-    <property name='xd' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-vendor-id' type='string' value=''/>
     <property name='kvm-asyncpf' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm_asyncpf' type='boolean' value='true' migratable='yes'/>
-    <property name='perfctr_core' type='boolean' value='false'/>
     <property name='perfctr-core' type='boolean' value='false'/>
     <property name='mpx' type='boolean' value='true' migratable='yes'/>
     <property name='pbe' type='boolean' value='false'/>
-    <property name='decodeassists' type='boolean' value='false'/>
     <property name='avx512cd' type='boolean' value='false'/>
-    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
+    <property name='decodeassists' type='boolean' value='false'/>
     <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
     <property name='family' type='number' value='6'/>
-    <property name='legacy-cache' type='boolean' value='true' migratable='yes'/>
-    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
     <property name='avx512f' type='boolean' value='false'/>
     <property name='msr' type='boolean' value='true' migratable='yes'/>
     <property name='mce' type='boolean' value='true' migratable='yes'/>
     <property name='mca' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-runtime' type='boolean' value='false'/>
     <property name='xcrypt' type='boolean' value='false'/>
-    <property name='thread-id' type='number' value='-1'/>
     <property name='min-level' type='number' value='13'/>
     <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
     <property name='cid' type='boolean' value='false'/>
-    <property name='hv-relaxed' type='boolean' value='false'/>
-    <property name='hv-crash' type='boolean' value='false'/>
     <property name='ds' type='boolean' value='false'/>
     <property name='fxsr' type='boolean' value='true' migratable='yes'/>
     <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
@@ -250,64 +233,47 @@
     <property name='3dnowprefetch' type='boolean' value='true' migratable='yes'/>
     <property name='avx512vbmi2' type='boolean' value='false'/>
     <property name='cr8legacy' type='boolean' value='false'/>
-    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
     <property name='xcrypt-en' type='boolean' value='false'/>
-    <property name='kvm_pv_eoi' type='boolean' value='true' migratable='yes'/>
-    <property name='apic-id' type='number' value='4294967295'/>
     <property name='pn' type='boolean' value='false'/>
     <property name='dca' type='boolean' value='false'/>
     <property name='vendor' type='string' value='GenuineIntel'/>
     <property name='pku' type='boolean' value='false'/>
     <property name='smx' type='boolean' value='false'/>
-    <property name='cmp_legacy' type='boolean' value='false'/>
     <property name='cmp-legacy' type='boolean' value='false'/>
-    <property name='node-id' type='number' value='-1'/>
     <property name='avx512-4fmaps' type='boolean' value='false'/>
-    <property name='vmcb_clean' type='boolean' value='false'/>
     <property name='vmcb-clean' type='boolean' value='false'/>
+    <property name='hle' type='boolean' value='true' migratable='yes'/>
     <property name='3dnowext' type='boolean' value='false'/>
     <property name='amd-no-ssb' type='boolean' value='false'/>
-    <property name='hle' type='boolean' value='true' migratable='yes'/>
     <property name='npt' type='boolean' value='false'/>
-    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
     <property name='clwb' type='boolean' value='false'/>
     <property name='lbrv' type='boolean' value='false'/>
     <property name='adx' type='boolean' value='true' migratable='yes'/>
     <property name='ss' type='boolean' value='true' migratable='yes'/>
     <property name='pni' type='boolean' value='true' migratable='yes'/>
-    <property name='svm_lock' type='boolean' value='false'/>
     <property name='svm-lock' type='boolean' value='false'/>
-    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='smep' type='boolean' value='true' migratable='yes'/>
     <property name='smap' type='boolean' value='true' migratable='yes'/>
+    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='x2apic' type='boolean' value='true' migratable='yes'/>
     <property name='avx512vbmi' type='boolean' value='false'/>
     <property name='avx512vnni' type='boolean' value='false'/>
-    <property name='hv-stimer' type='boolean' value='false'/>
-    <property name='i64' type='boolean' value='true' migratable='yes'/>
     <property name='flushbyasid' type='boolean' value='false'/>
     <property name='f16c' type='boolean' value='true' migratable='yes'/>
     <property name='ace2-en' type='boolean' value='false'/>
-    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='pae' type='boolean' value='true' migratable='yes'/>
+    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='sse' type='boolean' value='true' migratable='yes'/>
     <property name='phe-en' type='boolean' value='false'/>
-    <property name='kvm_nopiodelay' type='boolean' value='true' migratable='yes'/>
     <property name='kvm-nopiodelay' type='boolean' value='true' migratable='yes'/>
     <property name='tm' type='boolean' value='false'/>
     <property name='kvmclock-stable-bit' type='boolean' value='true' migratable='yes'/>
     <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-    <property name='socket-id' type='number' value='-1'/>
     <property name='pcommit' type='boolean' value='false'/>
     <property name='syscall' type='boolean' value='true' migratable='yes'/>
-    <property name='level' type='number' value='13'/>
     <property name='avx512dq' type='boolean' value='false'/>
-    <property name='x-migrate-smi-count' type='boolean' value='true' migratable='yes'/>
     <property name='svm' type='boolean' value='false'/>
-    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-reset' type='boolean' value='false'/>
     <property name='invtsc' type='boolean' value='true' migratable='no'/>
-    <property name='sse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse2' type='boolean' value='true' migratable='yes'/>
     <property name='ssbd' type='boolean' value='false'/>
     <property name='est' type='boolean' value='false'/>
@@ -316,22 +282,14 @@
     <property name='kvm-pv-eoi' type='boolean' value='true' migratable='yes'/>
     <property name='cx8' type='boolean' value='true' migratable='yes'/>
     <property name='cldemote' type='boolean' value='false'/>
-    <property name='hv-reenlightenment' type='boolean' value='false'/>
-    <property name='kvm_mmu' type='boolean' value='false'/>
     <property name='kvm-mmu' type='boolean' value='false'/>
-    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
     <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
     <property name='pge' type='boolean' value='true' migratable='yes'/>
-    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
     <property name='avx512bitalg' type='boolean' value='false'/>
-    <property name='nodeid_msr' type='boolean' value='false'/>
     <property name='pdcm' type='boolean' value='false'/>
-    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='model' type='number' value='94'/>
-    <property name='nrip_save' type='boolean' value='false'/>
+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='nrip-save' type='boolean' value='false'/>
-    <property name='kvm_pv_unhalt' type='boolean' value='true' migratable='yes'/>
     <property name='ssse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse4a' type='boolean' value='false'/>
     <property name='invpcid' type='boolean' value='true' migratable='yes'/>
@@ -340,7 +298,6 @@
     <property name='fma' type='boolean' value='true' migratable='yes'/>
     <property name='cx16' type='boolean' value='true' migratable='yes'/>
     <property name='de' type='boolean' value='true' migratable='yes'/>
-    <property name='enforce' type='boolean' value='false'/>
     <property name='stepping' type='number' value='3'/>
     <property name='xsave' type='boolean' value='true' migratable='yes'/>
     <property name='clflush' type='boolean' value='true' migratable='yes'/>
@@ -348,67 +305,48 @@
     <property name='tsc' type='boolean' value='true' migratable='yes'/>
     <property name='tce' type='boolean' value='false'/>
     <property name='fpu' type='boolean' value='true' migratable='yes'/>
-    <property name='ibs' type='boolean' value='false'/>
-    <property name='ds_cpl' type='boolean' value='false'/>
     <property name='ds-cpl' type='boolean' value='false'/>
-    <property name='host-phys-bits' type='boolean' value='false'/>
+    <property name='ibs' type='boolean' value='false'/>
     <property name='fma4' type='boolean' value='false'/>
     <property name='la57' type='boolean' value='false'/>
     <property name='osvw' type='boolean' value='false'/>
-    <property name='check' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-spinlocks' type='number' value='-1'/>
-    <property name='pmu' type='boolean' value='false'/>
-    <property name='pmm' type='boolean' value='false'/>
     <property name='apic' type='boolean' value='true' migratable='yes'/>
+    <property name='pmm' type='boolean' value='false'/>
     <property name='spec-ctrl' type='boolean' value='true' migratable='yes'/>
-    <property name='min-xlevel2' type='number' value='0'/>
     <property name='tsc-adjust' type='boolean' value='true' migratable='yes'/>
-    <property name='tsc_adjust' type='boolean' value='true' migratable='yes'/>
     <property name='kvm-steal-time' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm_steal_time' type='boolean' value='true' migratable='yes'/>
     <property name='kvmclock' type='boolean' value='true' migratable='yes'/>
-    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
     <property name='lwp' type='boolean' value='false'/>
     <property name='amd-ssbd' type='boolean' value='false'/>
-    <property name='ibpb' type='boolean' value='false'/>
     <property name='xop' type='boolean' value='false'/>
+    <property name='ibpb' type='boolean' value='false'/>
     <property name='avx' type='boolean' value='true' migratable='yes'/>
-    <property name='ace2' type='boolean' value='false'/>
-    <property name='avx512bw' type='boolean' value='false'/>
     <property name='acpi' type='boolean' value='false'/>
-    <property name='hv-vapic' type='boolean' value='false'/>
+    <property name='avx512bw' type='boolean' value='false'/>
+    <property name='ace2' type='boolean' value='false'/>
     <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
     <property name='ht' type='boolean' value='false'/>
     <property name='nx' type='boolean' value='true' migratable='yes'/>
     <property name='pclmulqdq' type='boolean' value='true' migratable='yes'/>
     <property name='mmxext' type='boolean' value='false'/>
-    <property name='vaes' type='boolean' value='false'/>
     <property name='popcnt' type='boolean' value='true' migratable='yes'/>
+    <property name='vaes' type='boolean' value='false'/>
     <property name='xsaves' type='boolean' value='true' migratable='yes'/>
-    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
     <property name='lm' type='boolean' value='true' migratable='yes'/>
     <property name='umip' type='boolean' value='true' migratable='yes'/>
     <property name='pse' type='boolean' value='true' migratable='yes'/>
     <property name='avx2' type='boolean' value='true' migratable='yes'/>
     <property name='sep' type='boolean' value='true' migratable='yes'/>
-    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
     <property name='virt-ssbd' type='boolean' value='false'/>
-    <property name='x-hv-max-vps' type='number' value='-1'/>
     <property name='nodeid-msr' type='boolean' value='false'/>
-    <property name='kvm' type='boolean' value='true' migratable='yes'/>
     <property name='misalignsse' type='boolean' value='false'/>
     <property name='min-xlevel' type='number' value='2147483656'/>
-    <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/>
-    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
     <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-    <property name='realized' type='boolean' value='false'/>
-    <property name='tsc_scale' type='boolean' value='false'/>
+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/>
     <property name='tsc-scale' type='boolean' value='false'/>
     <property name='topoext' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-vpindex' type='boolean' value='false'/>
-    <property name='xlevel2' type='number' value='0'/>
     <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
     <property name='monitor' type='boolean' value='false'/>
     <property name='avx512er' type='boolean' value='false'/>
     <property name='pmm-en' type='boolean' value='false'/>
@@ -416,25 +354,18 @@
     <property name='3dnow' type='boolean' value='false'/>
     <property name='erms' type='boolean' value='true' migratable='yes'/>
     <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
     <property name='vpclmulqdq' type='boolean' value='false'/>
     <property name='fxsr-opt' type='boolean' value='false'/>
-    <property name='hv-synic' type='boolean' value='false'/>
     <property name='xstore' type='boolean' value='false'/>
-    <property name='fxsr_opt' type='boolean' value='false'/>
-    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
     <property name='rtm' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
     <property name='lmce' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-time' type='boolean' value='false'/>
     <property name='perfctr-nb' type='boolean' value='false'/>
-    <property name='perfctr_nb' type='boolean' value='false'/>
-    <property name='ffxsr' type='boolean' value='false'/>
-    <property name='hv-tlbflush' type='boolean' value='false'/>
     <property name='rdrand' type='boolean' value='true' migratable='yes'/>
     <property name='rdseed' type='boolean' value='true' migratable='yes'/>
     <property name='avx512-4vnniw' type='boolean' value='false'/>
-    <property name='vmx' type='boolean' value='true' migratable='yes'/>
     <property name='vme' type='boolean' value='true' migratable='yes'/>
+    <property name='vmx' type='boolean' value='true' migratable='yes'/>
     <property name='dtes64' type='boolean' value='false'/>
     <property name='mtrr' type='boolean' value='true' migratable='yes'/>
     <property name='rdtscp' type='boolean' value='true' migratable='yes'/>
@@ -442,9 +373,8 @@
     <property name='kvm-pv-tlb-flush' type='boolean' value='true' migratable='yes'/>
     <property name='tbm' type='boolean' value='false'/>
     <property name='wdt' type='boolean' value='false'/>
-    <property name='pause_filter' type='boolean' value='false'/>
-    <property name='sha-ni' type='boolean' value='false'/>
     <property name='model-id' type='string' value='Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz'/>
+    <property name='sha-ni' type='boolean' value='false'/>
     <property name='abm' type='boolean' value='true' migratable='yes'/>
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
@@ -608,9 +538,6 @@
   <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
   <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
   <hostCPU type='tcg' model='base' migratability='yes'>
-    <property name='phys-bits' type='number' value='0'/>
-    <property name='core-id' type='number' value='-1'/>
-    <property name='xlevel' type='number' value='2147483658'/>
     <property name='cmov' type='boolean' value='true' migratable='yes'/>
     <property name='ia64' type='boolean' value='false'/>
     <property name='aes' type='boolean' value='true' migratable='yes'/>
@@ -621,36 +548,22 @@
     <property name='pause-filter' type='boolean' value='false'/>
     <property name='xsavec' type='boolean' value='false'/>
     <property name='intel-pt' type='boolean' value='false'/>
-    <property name='hv-frequencies' type='boolean' value='false'/>
-    <property name='tsc-frequency' type='number' value='0'/>
-    <property name='xd' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-vendor-id' type='string' value=''/>
     <property name='kvm-asyncpf' type='boolean' value='false'/>
-    <property name='kvm_asyncpf' type='boolean' value='false'/>
-    <property name='perfctr_core' type='boolean' value='false'/>
     <property name='perfctr-core' type='boolean' value='false'/>
     <property name='mpx' type='boolean' value='true' migratable='yes'/>
     <property name='pbe' type='boolean' value='false'/>
-    <property name='decodeassists' type='boolean' value='false'/>
     <property name='avx512cd' type='boolean' value='false'/>
-    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
+    <property name='decodeassists' type='boolean' value='false'/>
     <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
     <property name='family' type='number' value='6'/>
-    <property name='legacy-cache' type='boolean' value='true' migratable='yes'/>
-    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
     <property name='avx512f' type='boolean' value='false'/>
     <property name='msr' type='boolean' value='true' migratable='yes'/>
     <property name='mce' type='boolean' value='true' migratable='yes'/>
     <property name='mca' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-runtime' type='boolean' value='false'/>
     <property name='xcrypt' type='boolean' value='false'/>
-    <property name='thread-id' type='number' value='-1'/>
     <property name='min-level' type='number' value='13'/>
     <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
     <property name='cid' type='boolean' value='false'/>
-    <property name='hv-relaxed' type='boolean' value='false'/>
-    <property name='hv-crash' type='boolean' value='false'/>
     <property name='ds' type='boolean' value='false'/>
     <property name='fxsr' type='boolean' value='true' migratable='yes'/>
     <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
@@ -662,64 +575,47 @@
     <property name='3dnowprefetch' type='boolean' value='false'/>
     <property name='avx512vbmi2' type='boolean' value='false'/>
     <property name='cr8legacy' type='boolean' value='true' migratable='yes'/>
-    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
     <property name='xcrypt-en' type='boolean' value='false'/>
-    <property name='kvm_pv_eoi' type='boolean' value='false'/>
-    <property name='apic-id' type='number' value='4294967295'/>
     <property name='pn' type='boolean' value='false'/>
     <property name='dca' type='boolean' value='false'/>
     <property name='vendor' type='string' value='AuthenticAMD'/>
     <property name='pku' type='boolean' value='true' migratable='yes'/>
     <property name='smx' type='boolean' value='false'/>
-    <property name='cmp_legacy' type='boolean' value='false'/>
     <property name='cmp-legacy' type='boolean' value='false'/>
-    <property name='node-id' type='number' value='-1'/>
     <property name='avx512-4fmaps' type='boolean' value='false'/>
-    <property name='vmcb_clean' type='boolean' value='false'/>
     <property name='vmcb-clean' type='boolean' value='false'/>
+    <property name='hle' type='boolean' value='false'/>
     <property name='3dnowext' type='boolean' value='true' migratable='yes'/>
     <property name='amd-no-ssb' type='boolean' value='false'/>
-    <property name='hle' type='boolean' value='false'/>
     <property name='npt' type='boolean' value='true' migratable='yes'/>
-    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
     <property name='clwb' type='boolean' value='true' migratable='yes'/>
     <property name='lbrv' type='boolean' value='false'/>
     <property name='adx' type='boolean' value='true' migratable='yes'/>
     <property name='ss' type='boolean' value='true' migratable='yes'/>
     <property name='pni' type='boolean' value='true' migratable='yes'/>
-    <property name='svm_lock' type='boolean' value='false'/>
     <property name='svm-lock' type='boolean' value='false'/>
-    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='smep' type='boolean' value='true' migratable='yes'/>
     <property name='smap' type='boolean' value='true' migratable='yes'/>
+    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='x2apic' type='boolean' value='false'/>
     <property name='avx512vbmi' type='boolean' value='false'/>
     <property name='avx512vnni' type='boolean' value='false'/>
-    <property name='hv-stimer' type='boolean' value='false'/>
-    <property name='i64' type='boolean' value='true' migratable='yes'/>
     <property name='flushbyasid' type='boolean' value='false'/>
     <property name='f16c' type='boolean' value='false'/>
     <property name='ace2-en' type='boolean' value='false'/>
-    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='pae' type='boolean' value='true' migratable='yes'/>
+    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='sse' type='boolean' value='true' migratable='yes'/>
     <property name='phe-en' type='boolean' value='false'/>
-    <property name='kvm_nopiodelay' type='boolean' value='false'/>
     <property name='kvm-nopiodelay' type='boolean' value='false'/>
     <property name='tm' type='boolean' value='false'/>
     <property name='kvmclock-stable-bit' type='boolean' value='false'/>
     <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-    <property name='socket-id' type='number' value='-1'/>
     <property name='pcommit' type='boolean' value='true' migratable='yes'/>
     <property name='syscall' type='boolean' value='true' migratable='yes'/>
-    <property name='level' type='number' value='13'/>
     <property name='avx512dq' type='boolean' value='false'/>
-    <property name='x-migrate-smi-count' type='boolean' value='true' migratable='yes'/>
     <property name='svm' type='boolean' value='true' migratable='yes'/>
-    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-reset' type='boolean' value='false'/>
     <property name='invtsc' type='boolean' value='false'/>
-    <property name='sse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse2' type='boolean' value='true' migratable='yes'/>
     <property name='ssbd' type='boolean' value='false'/>
     <property name='est' type='boolean' value='false'/>
@@ -728,22 +624,14 @@
     <property name='kvm-pv-eoi' type='boolean' value='false'/>
     <property name='cx8' type='boolean' value='true' migratable='yes'/>
     <property name='cldemote' type='boolean' value='false'/>
-    <property name='hv-reenlightenment' type='boolean' value='false'/>
-    <property name='kvm_mmu' type='boolean' value='false'/>
     <property name='kvm-mmu' type='boolean' value='false'/>
-    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
     <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
     <property name='pge' type='boolean' value='true' migratable='yes'/>
-    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
     <property name='avx512bitalg' type='boolean' value='false'/>
-    <property name='nodeid_msr' type='boolean' value='false'/>
     <property name='pdcm' type='boolean' value='false'/>
-    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='model' type='number' value='6'/>
-    <property name='nrip_save' type='boolean' value='false'/>
+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='nrip-save' type='boolean' value='false'/>
-    <property name='kvm_pv_unhalt' type='boolean' value='false'/>
     <property name='ssse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse4a' type='boolean' value='true' migratable='yes'/>
     <property name='invpcid' type='boolean' value='false'/>
@@ -752,7 +640,6 @@
     <property name='fma' type='boolean' value='false'/>
     <property name='cx16' type='boolean' value='true' migratable='yes'/>
     <property name='de' type='boolean' value='true' migratable='yes'/>
-    <property name='enforce' type='boolean' value='false'/>
     <property name='stepping' type='number' value='3'/>
     <property name='xsave' type='boolean' value='true' migratable='yes'/>
     <property name='clflush' type='boolean' value='true' migratable='yes'/>
@@ -760,67 +647,48 @@
     <property name='tsc' type='boolean' value='true' migratable='yes'/>
     <property name='tce' type='boolean' value='false'/>
     <property name='fpu' type='boolean' value='true' migratable='yes'/>
-    <property name='ibs' type='boolean' value='false'/>
-    <property name='ds_cpl' type='boolean' value='false'/>
     <property name='ds-cpl' type='boolean' value='false'/>
-    <property name='host-phys-bits' type='boolean' value='false'/>
+    <property name='ibs' type='boolean' value='false'/>
     <property name='fma4' type='boolean' value='false'/>
     <property name='la57' type='boolean' value='true' migratable='yes'/>
     <property name='osvw' type='boolean' value='false'/>
-    <property name='check' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-spinlocks' type='number' value='-1'/>
-    <property name='pmu' type='boolean' value='false'/>
-    <property name='pmm' type='boolean' value='false'/>
     <property name='apic' type='boolean' value='true' migratable='yes'/>
+    <property name='pmm' type='boolean' value='false'/>
     <property name='spec-ctrl' type='boolean' value='false'/>
-    <property name='min-xlevel2' type='number' value='0'/>
     <property name='tsc-adjust' type='boolean' value='false'/>
-    <property name='tsc_adjust' type='boolean' value='false'/>
     <property name='kvm-steal-time' type='boolean' value='false'/>
-    <property name='kvm_steal_time' type='boolean' value='false'/>
     <property name='kvmclock' type='boolean' value='false'/>
-    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
     <property name='lwp' type='boolean' value='false'/>
     <property name='amd-ssbd' type='boolean' value='false'/>
-    <property name='ibpb' type='boolean' value='false'/>
     <property name='xop' type='boolean' value='false'/>
+    <property name='ibpb' type='boolean' value='false'/>
     <property name='avx' type='boolean' value='false'/>
-    <property name='ace2' type='boolean' value='false'/>
-    <property name='avx512bw' type='boolean' value='false'/>
     <property name='acpi' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-vapic' type='boolean' value='false'/>
+    <property name='avx512bw' type='boolean' value='false'/>
+    <property name='ace2' type='boolean' value='false'/>
     <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
     <property name='ht' type='boolean' value='false'/>
     <property name='nx' type='boolean' value='true' migratable='yes'/>
     <property name='pclmulqdq' type='boolean' value='true' migratable='yes'/>
     <property name='mmxext' type='boolean' value='true' migratable='yes'/>
-    <property name='vaes' type='boolean' value='false'/>
     <property name='popcnt' type='boolean' value='true' migratable='yes'/>
+    <property name='vaes' type='boolean' value='false'/>
     <property name='xsaves' type='boolean' value='false'/>
-    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
     <property name='lm' type='boolean' value='true' migratable='yes'/>
     <property name='umip' type='boolean' value='false'/>
     <property name='pse' type='boolean' value='true' migratable='yes'/>
     <property name='avx2' type='boolean' value='false'/>
     <property name='sep' type='boolean' value='true' migratable='yes'/>
-    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
     <property name='virt-ssbd' type='boolean' value='false'/>
-    <property name='x-hv-max-vps' type='number' value='-1'/>
     <property name='nodeid-msr' type='boolean' value='false'/>
-    <property name='kvm' type='boolean' value='true' migratable='yes'/>
     <property name='misalignsse' type='boolean' value='false'/>
     <property name='min-xlevel' type='number' value='2147483658'/>
-    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
-    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
     <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-    <property name='realized' type='boolean' value='false'/>
-    <property name='tsc_scale' type='boolean' value='false'/>
+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
     <property name='tsc-scale' type='boolean' value='false'/>
     <property name='topoext' type='boolean' value='false'/>
-    <property name='hv-vpindex' type='boolean' value='false'/>
-    <property name='xlevel2' type='number' value='0'/>
     <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
     <property name='monitor' type='boolean' value='true' migratable='yes'/>
     <property name='avx512er' type='boolean' value='false'/>
     <property name='pmm-en' type='boolean' value='false'/>
@@ -828,25 +696,18 @@
     <property name='3dnow' type='boolean' value='true' migratable='yes'/>
     <property name='erms' type='boolean' value='true' migratable='yes'/>
     <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
     <property name='vpclmulqdq' type='boolean' value='false'/>
     <property name='fxsr-opt' type='boolean' value='false'/>
-    <property name='hv-synic' type='boolean' value='false'/>
     <property name='xstore' type='boolean' value='false'/>
-    <property name='fxsr_opt' type='boolean' value='false'/>
-    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
     <property name='rtm' type='boolean' value='false'/>
+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
     <property name='lmce' type='boolean' value='false'/>
-    <property name='hv-time' type='boolean' value='false'/>
     <property name='perfctr-nb' type='boolean' value='false'/>
-    <property name='perfctr_nb' type='boolean' value='false'/>
-    <property name='ffxsr' type='boolean' value='false'/>
-    <property name='hv-tlbflush' type='boolean' value='false'/>
     <property name='rdrand' type='boolean' value='false'/>
     <property name='rdseed' type='boolean' value='false'/>
     <property name='avx512-4vnniw' type='boolean' value='false'/>
-    <property name='vmx' type='boolean' value='false'/>
     <property name='vme' type='boolean' value='false'/>
+    <property name='vmx' type='boolean' value='false'/>
     <property name='dtes64' type='boolean' value='false'/>
     <property name='mtrr' type='boolean' value='true' migratable='yes'/>
     <property name='rdtscp' type='boolean' value='true' migratable='yes'/>
@@ -854,9 +715,8 @@
     <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
     <property name='tbm' type='boolean' value='false'/>
     <property name='wdt' type='boolean' value='false'/>
-    <property name='pause_filter' type='boolean' value='false'/>
-    <property name='sha-ni' type='boolean' value='false'/>
     <property name='model-id' type='string' value='QEMU TCG CPU version 2.5+'/>
+    <property name='sha-ni' type='boolean' value='false'/>
     <property name='abm' type='boolean' value='true' migratable='yes'/>
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
index d021745a06..ca171e73d9 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
@@ -20921,7 +20921,19 @@
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
-    "type": "full",
+    "type": "static",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false
+      }
+    }
+  },
+  "id": "libvirt-49"
+}
+
+{
+  "return": {
     "model": {
       "name": "base",
       "props": {
@@ -21007,7 +21019,7 @@
         "syscall": true,
         "avx512dq": false,
         "svm": false,
-        "invtsc": false,
+        "invtsc": true,
         "sse2": true,
         "ssbd": false,
         "est": false,
@@ -21088,7 +21100,7 @@
         "avx512er": false,
         "pmm-en": false,
         "pcid": true,
-        "arch-capabilities": false,
+        "arch-capabilities": true,
         "3dnow": false,
         "erms": true,
         "lahf-lm": true,
@@ -21122,2405 +21134,743 @@
   "id": "libvirt-49"
 }
 
+{
+  "execute": "qmp_capabilities",
+  "id": "libvirt-1"
+}
+
 {
   "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483656,
-        "cmov": true,
-        "ia64": false,
-        "ssb-no": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "ibrs-all": false,
-        "pause-filter": false,
-        "xsavec": true,
-        "intel-pt": false,
-        "hv-frequencies": 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,
-        "decodeassists": false,
-        "avx512cd": false,
-        "sse4_1": true,
-        "sse4.1": true,
-        "sse4-1": true,
-        "family": 6,
-        "legacy-cache": true,
-        "vmware-cpuid-freq": true,
-        "wbnoinvd": false,
-        "avx512f": false,
-        "msr": true,
-        "mce": true,
-        "mca": true,
-        "hv-runtime": false,
-        "xcrypt": false,
-        "thread-id": -1,
-        "min-level": 13,
-        "xgetbv1": true,
-        "cid": false,
-        "hv-relaxed": false,
-        "hv-crash": false,
-        "ds": false,
-        "fxsr": true,
-        "xsaveopt": true,
-        "xtpr": false,
-        "hv-evmcs": false,
-        "avx512vl": false,
-        "avx512-vpopcntdq": false,
-        "phe": false,
-        "extapic": false,
-        "3dnowprefetch": true,
-        "avx512vbmi2": false,
-        "cr8legacy": false,
-        "cpuid-0xb": true,
-        "xcrypt-en": false,
-        "kvm_pv_eoi": true,
-        "apic-id": 4294967295,
-        "rsba": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "GenuineIntel",
-        "hv-ipi": false,
-        "pku": false,
-        "smx": false,
-        "cmp_legacy": false,
-        "cmp-legacy": false,
-        "node-id": -1,
-        "avx512-4fmaps": false,
-        "vmcb_clean": false,
-        "vmcb-clean": false,
-        "3dnowext": false,
-        "amd-no-ssb": false,
-        "hle": true,
-        "npt": false,
-        "rdctl-no": false,
-        "memory": "/machine/unattached/system[0]",
-        "clwb": false,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm_lock": false,
-        "svm-lock": false,
-        "pfthreshold": false,
-        "smep": true,
-        "smap": true,
-        "x2apic": true,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "hv-stimer": false,
-        "x-hv-synic-kvm-only": 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,
-        "x-migrate-smi-count": true,
-        "svm": false,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
-        "invtsc": false,
-        "sse3": true,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-ipi": false,
-        "kvm-pv-eoi": true,
-        "cx8": true,
-        "cldemote": false,
-        "hv-reenlightenment": false,
-        "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": 94,
-        "nrip_save": false,
-        "nrip-save": false,
-        "kvm_pv_unhalt": true,
-        "ssse3": true,
-        "sse4a": false,
-        "invpcid": true,
-        "pdpe1gb": true,
-        "tsc-deadline": true,
-        "skip-l1dfl-vmentry": true,
-        "fma": true,
-        "cx16": true,
-        "de": true,
-        "pconfig": false,
-        "enforce": false,
-        "stepping": 3,
-        "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": true,
-        "min-xlevel2": 0,
-        "tsc-adjust": true,
-        "tsc_adjust": true,
-        "kvm-steal-time": true,
-        "kvm_steal_time": true,
-        "kvmclock": true,
-        "l3-cache": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "ibpb": false,
-        "xop": false,
-        "avx": true,
-        "ace2": false,
-        "avx512bw": false,
-        "acpi": false,
-        "hv-vapic": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": false,
-        "vaes": false,
-        "popcnt": true,
-        "xsaves": true,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": true,
-        "pse": true,
-        "avx2": true,
-        "sep": true,
-        "pclmuldq": true,
-        "virt-ssbd": false,
-        "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": true,
-        "kvm-no-smi-migration": false,
-        "monitor": false,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": true,
-        "arch-capabilities": false,
-        "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": false,
-        "rtm": true,
-        "lmce": true,
-        "hv-time": false,
-        "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
-        "hv-tlbflush": false,
-        "rdrand": true,
-        "rdseed": true,
-        "avx512-4vnniw": false,
-        "vmx": true,
-        "vme": true,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": true,
-        "tbm": false,
-        "wdt": false,
-        "pause_filter": false,
-        "sha-ni": false,
-        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-1"
 }
 
 {
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "host",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-50"
+  "execute": "query-cpu-definitions",
+  "id": "libvirt-2"
 }
 
 {
-  "return": {
-    "model": {
+  "return": [
+    {
+      "name": "max",
+      "typename": "max-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": false
+    },
+    {
+      "name": "host",
+      "typename": "host-x86_64-cpu",
+      "unavailable-features": [
+        "kvm"
+      ],
+      "static": false,
+      "migration-safe": false
+    },
+    {
       "name": "base",
-      "props": {
-        "cmov": true,
-        "ia64": false,
-        "ssb-no": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "ibrs-all": false,
-        "pause-filter": false,
-        "xsavec": true,
-        "intel-pt": false,
-        "kvm-asyncpf": true,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "avx512cd": false,
-        "decodeassists": false,
-        "sse4.1": true,
-        "family": 6,
-        "wbnoinvd": false,
-        "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,
-        "avx512vbmi2": false,
-        "cr8legacy": false,
-        "xcrypt-en": false,
-        "pn": false,
-        "rsba": false,
-        "dca": false,
-        "vendor": "GenuineIntel",
-        "pku": false,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": true,
-        "3dnowext": false,
-        "amd-no-ssb": false,
-        "npt": false,
-        "rdctl-no": false,
-        "clwb": false,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": true,
-        "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": true,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": true,
-        "kvm-pv-ipi": false,
-        "cx8": true,
-        "cldemote": false,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "avx512bitalg": false,
-        "pdcm": false,
-        "model": 94,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": false,
-        "invpcid": true,
-        "pdpe1gb": true,
-        "tsc-deadline": true,
-        "skip-l1dfl-vmentry": true,
-        "fma": true,
-        "cx16": true,
-        "de": true,
-        "pconfig": false,
-        "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,
-        "spec-ctrl": true,
-        "tsc-adjust": true,
-        "kvm-steal-time": true,
-        "kvmclock": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "xop": false,
-        "ibpb": false,
-        "avx": true,
-        "acpi": false,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": false,
-        "popcnt": true,
-        "vaes": false,
-        "xsaves": true,
-        "lm": true,
-        "umip": true,
-        "pse": true,
-        "avx2": true,
-        "sep": true,
-        "virt-ssbd": false,
-        "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,
-        "arch-capabilities": true,
-        "3dnow": false,
-        "erms": true,
-        "lahf-lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": true,
-        "kvm-hint-dedicated": false,
-        "lmce": true,
-        "perfctr-nb": false,
-        "rdrand": true,
-        "rdseed": true,
-        "avx512-4vnniw": false,
-        "vme": true,
-        "vmx": true,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": 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-50"
-}
-
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "full",
-    "model": {
-      "name": "base",
-      "props": {
-        "cmov": true,
-        "ia64": false,
-        "ssb-no": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "ibrs-all": false,
-        "pause-filter": false,
-        "xsavec": true,
-        "intel-pt": false,
-        "kvm-asyncpf": true,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "avx512cd": false,
-        "decodeassists": false,
-        "sse4.1": true,
-        "family": 6,
-        "wbnoinvd": false,
-        "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,
-        "avx512vbmi2": false,
-        "cr8legacy": false,
-        "xcrypt-en": false,
-        "pn": false,
-        "rsba": false,
-        "dca": false,
-        "vendor": "GenuineIntel",
-        "pku": false,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": true,
-        "3dnowext": false,
-        "amd-no-ssb": false,
-        "npt": false,
-        "rdctl-no": false,
-        "clwb": false,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": true,
-        "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": true,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": true,
-        "kvm-pv-ipi": false,
-        "cx8": true,
-        "cldemote": false,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "avx512bitalg": false,
-        "pdcm": false,
-        "model": 94,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": false,
-        "invpcid": true,
-        "pdpe1gb": true,
-        "tsc-deadline": true,
-        "skip-l1dfl-vmentry": true,
-        "fma": true,
-        "cx16": true,
-        "de": true,
-        "pconfig": false,
-        "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,
-        "spec-ctrl": true,
-        "tsc-adjust": true,
-        "kvm-steal-time": true,
-        "kvmclock": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "xop": false,
-        "ibpb": false,
-        "avx": true,
-        "acpi": false,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": false,
-        "popcnt": true,
-        "vaes": false,
-        "xsaves": true,
-        "lm": true,
-        "umip": true,
-        "pse": true,
-        "avx2": true,
-        "sep": true,
-        "virt-ssbd": false,
-        "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,
-        "arch-capabilities": true,
-        "3dnow": false,
-        "erms": true,
-        "lahf-lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": true,
-        "kvm-hint-dedicated": false,
-        "lmce": true,
-        "perfctr-nb": false,
-        "rdrand": true,
-        "rdseed": true,
-        "avx512-4vnniw": false,
-        "vme": true,
-        "vmx": true,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": 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-51"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483656,
-        "cmov": true,
-        "ia64": false,
-        "ssb-no": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "ibrs-all": false,
-        "pause-filter": false,
-        "xsavec": true,
-        "intel-pt": false,
-        "hv-frequencies": 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,
-        "decodeassists": false,
-        "avx512cd": false,
-        "sse4_1": true,
-        "sse4.1": true,
-        "sse4-1": true,
-        "family": 6,
-        "legacy-cache": true,
-        "vmware-cpuid-freq": true,
-        "wbnoinvd": false,
-        "avx512f": false,
-        "msr": true,
-        "mce": true,
-        "mca": true,
-        "hv-runtime": false,
-        "xcrypt": false,
-        "thread-id": -1,
-        "min-level": 13,
-        "xgetbv1": true,
-        "cid": false,
-        "hv-relaxed": false,
-        "hv-crash": false,
-        "ds": false,
-        "fxsr": true,
-        "xsaveopt": true,
-        "xtpr": false,
-        "hv-evmcs": false,
-        "avx512vl": false,
-        "avx512-vpopcntdq": false,
-        "phe": false,
-        "extapic": false,
-        "3dnowprefetch": true,
-        "avx512vbmi2": false,
-        "cr8legacy": false,
-        "cpuid-0xb": true,
-        "xcrypt-en": false,
-        "kvm_pv_eoi": true,
-        "apic-id": 4294967295,
-        "rsba": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "GenuineIntel",
-        "hv-ipi": false,
-        "pku": false,
-        "smx": false,
-        "cmp_legacy": false,
-        "cmp-legacy": false,
-        "node-id": -1,
-        "avx512-4fmaps": false,
-        "vmcb_clean": false,
-        "vmcb-clean": false,
-        "3dnowext": false,
-        "amd-no-ssb": false,
-        "hle": true,
-        "npt": false,
-        "rdctl-no": false,
-        "memory": "/machine/unattached/system[0]",
-        "clwb": false,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm_lock": false,
-        "svm-lock": false,
-        "pfthreshold": false,
-        "smep": true,
-        "smap": true,
-        "x2apic": true,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "hv-stimer": false,
-        "x-hv-synic-kvm-only": 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,
-        "x-migrate-smi-count": true,
-        "svm": false,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
-        "invtsc": true,
-        "sse3": true,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-ipi": false,
-        "kvm-pv-eoi": true,
-        "cx8": true,
-        "cldemote": false,
-        "hv-reenlightenment": false,
-        "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": 94,
-        "nrip_save": false,
-        "nrip-save": false,
-        "kvm_pv_unhalt": true,
-        "ssse3": true,
-        "sse4a": false,
-        "invpcid": true,
-        "pdpe1gb": true,
-        "tsc-deadline": true,
-        "skip-l1dfl-vmentry": true,
-        "fma": true,
-        "cx16": true,
-        "de": true,
-        "pconfig": false,
-        "enforce": false,
-        "stepping": 3,
-        "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": true,
-        "min-xlevel2": 0,
-        "tsc-adjust": true,
-        "tsc_adjust": true,
-        "kvm-steal-time": true,
-        "kvm_steal_time": true,
-        "kvmclock": true,
-        "l3-cache": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "ibpb": false,
-        "xop": false,
-        "avx": true,
-        "ace2": false,
-        "avx512bw": false,
-        "acpi": false,
-        "hv-vapic": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": false,
-        "vaes": false,
-        "popcnt": true,
-        "xsaves": true,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": true,
-        "pse": true,
-        "avx2": true,
-        "sep": true,
-        "pclmuldq": true,
-        "virt-ssbd": false,
-        "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": true,
-        "kvm-no-smi-migration": false,
-        "monitor": false,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": true,
-        "arch-capabilities": 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": false,
-        "rtm": true,
-        "lmce": true,
-        "hv-time": false,
-        "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
-        "hv-tlbflush": false,
-        "rdrand": true,
-        "rdseed": true,
-        "avx512-4vnniw": false,
-        "vmx": true,
-        "vme": true,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": true,
-        "tbm": false,
-        "wdt": false,
-        "pause_filter": false,
-        "sha-ni": false,
-        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-51"
-}
-
-{
-  "execute": "qmp_capabilities",
-  "id": "libvirt-1"
-}
-
-{
-  "return": {
-  },
-  "id": "libvirt-1"
-}
-
-{
-  "execute": "query-cpu-definitions",
-  "id": "libvirt-2"
-}
-
-{
-  "return": [
-    {
-      "name": "max",
-      "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": false
-    },
-    {
-      "name": "host",
-      "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-        "kvm"
-      ],
-      "static": false,
-      "migration-safe": false
-    },
-    {
-      "name": "base",
-      "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": true,
-      "migration-safe": true
-    },
-    {
-      "name": "qemu64",
-      "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "qemu32",
-      "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "phenom",
-      "typename": "phenom-x86_64-cpu",
-      "unavailable-features": [
-        "fxsr-opt"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "pentium3",
-      "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "pentium2",
-      "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "pentium",
-      "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "n270",
-      "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "kvm64",
-      "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "kvm32",
-      "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "coreduo",
-      "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "core2duo",
-      "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "athlon",
-      "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Westmere-IBRS",
-      "typename": "Westmere-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Westmere",
-      "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Server-IBRS",
-      "typename": "Skylake-Server-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "avx512f",
-        "avx512dq",
-        "rdseed",
-        "avx512cd",
-        "avx512bw",
-        "avx512vl",
-        "spec-ctrl",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Server",
-      "typename": "Skylake-Server-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "avx512f",
-        "avx512dq",
-        "rdseed",
-        "avx512cd",
-        "avx512bw",
-        "avx512vl",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Client-IBRS",
-      "typename": "Skylake-Client-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "spec-ctrl",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Client",
-      "typename": "Skylake-Client-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "SandyBridge-IBRS",
-      "typename": "SandyBridge-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "SandyBridge",
-      "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Penryn",
-      "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G5",
-      "typename": "Opteron_G5-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "avx",
-        "f16c",
-        "misalignsse",
-        "3dnowprefetch",
-        "xop",
-        "fma4",
-        "tbm"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G4",
-      "typename": "Opteron_G4-x86_64-cpu",
-      "unavailable-features": [
-        "avx",
-        "misalignsse",
-        "3dnowprefetch",
-        "xop",
-        "fma4"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G3",
-      "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-        "misalignsse"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G2",
-      "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G1",
-      "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Nehalem-IBRS",
-      "typename": "Nehalem-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Nehalem",
-      "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "KnightsMill",
-      "typename": "KnightsMill-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "avx512f",
-        "rdseed",
-        "avx512pf",
-        "avx512er",
-        "avx512cd",
-        "avx512-vpopcntdq",
-        "avx512-4vnniw",
-        "avx512-4fmaps",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "IvyBridge-IBRS",
-      "typename": "IvyBridge-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "IvyBridge",
-      "typename": "IvyBridge-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Icelake-Server",
-      "typename": "Icelake-Server-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "avx512f",
-        "avx512dq",
-        "rdseed",
-        "intel-pt",
-        "avx512cd",
-        "avx512bw",
-        "avx512vl",
-        "avx512vbmi",
-        "umip",
-        "",
-        "avx512vbmi2",
-        "gfni",
-        "vaes",
-        "vpclmulqdq",
-        "avx512vnni",
-        "avx512bitalg",
-        "avx512-vpopcntdq",
-        "pconfig",
-        "spec-ctrl",
-        "ssbd",
-        "3dnowprefetch",
-        "wbnoinvd",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Icelake-Client",
-      "typename": "Icelake-Client-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "intel-pt",
-        "avx512vbmi",
-        "umip",
-        "",
-        "avx512vbmi2",
-        "gfni",
-        "vaes",
-        "vpclmulqdq",
-        "avx512vnni",
-        "avx512bitalg",
-        "avx512-vpopcntdq",
-        "spec-ctrl",
-        "ssbd",
-        "3dnowprefetch",
-        "wbnoinvd",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell-noTSX-IBRS",
-      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid",
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell-noTSX",
-      "typename": "Haswell-noTSX-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell-IBRS",
-      "typename": "Haswell-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell",
-      "typename": "Haswell-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "EPYC-IBPB",
-      "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "rdseed",
-        "sha-ni",
-        "fxsr-opt",
-        "misalignsse",
-        "3dnowprefetch",
-        "osvw",
-        "topoext",
-        "ibpb",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "EPYC",
-      "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "rdseed",
-        "sha-ni",
-        "fxsr-opt",
-        "misalignsse",
-        "3dnowprefetch",
-        "osvw",
-        "topoext",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Conroe",
-      "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Cascadelake-Server",
-      "typename": "Cascadelake-Server-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "avx512f",
-        "avx512dq",
-        "rdseed",
-        "intel-pt",
-        "avx512cd",
-        "avx512bw",
-        "avx512vl",
-        "",
-        "avx512vnni",
-        "spec-ctrl",
-        "ssbd",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell-noTSX-IBRS",
-      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid",
-        "rdseed",
-        "spec-ctrl",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell-noTSX",
-      "typename": "Broadwell-noTSX-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid",
-        "rdseed",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell-IBRS",
-      "typename": "Broadwell-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "spec-ctrl",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell",
-      "typename": "Broadwell-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "486",
-      "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    }
-  ],
-  "id": "libvirt-2"
-}
-
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "max"
-    }
-  },
-  "id": "libvirt-3"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "cmov": true,
-        "ia64": false,
-        "ssb-no": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "ibrs-all": false,
-        "pause-filter": false,
-        "xsavec": false,
-        "intel-pt": false,
-        "kvm-asyncpf": false,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "avx512cd": false,
-        "decodeassists": false,
-        "sse4.1": true,
-        "family": 6,
-        "wbnoinvd": false,
-        "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": false,
-        "avx512vbmi2": false,
-        "cr8legacy": true,
-        "xcrypt-en": false,
-        "pn": false,
-        "rsba": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "pku": true,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": false,
-        "3dnowext": true,
-        "amd-no-ssb": false,
-        "npt": true,
-        "rdctl-no": false,
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": true,
-        "pfthreshold": false,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pae": true,
-        "pat": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "pcommit": true,
-        "syscall": true,
-        "avx512dq": false,
-        "svm": true,
-        "invtsc": false,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": false,
-        "kvm-pv-ipi": false,
-        "cx8": true,
-        "cldemote": false,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "avx512bitalg": false,
-        "pdcm": false,
-        "model": 6,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "skip-l1dfl-vmentry": false,
-        "fma": false,
-        "cx16": true,
-        "de": true,
-        "pconfig": false,
-        "stepping": 3,
-        "xsave": true,
-        "clflush": true,
-        "skinit": false,
-        "tsc": true,
-        "tce": false,
-        "fpu": true,
-        "ds-cpl": false,
-        "ibs": false,
-        "fma4": false,
-        "la57": true,
-        "osvw": false,
-        "apic": true,
-        "pmm": false,
-        "spec-ctrl": false,
-        "tsc-adjust": false,
-        "kvm-steal-time": false,
-        "kvmclock": false,
-        "lwp": false,
-        "amd-ssbd": false,
-        "xop": false,
-        "ibpb": false,
-        "avx": false,
-        "acpi": true,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "popcnt": true,
-        "vaes": false,
-        "xsaves": false,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "virt-ssbd": false,
-        "nodeid-msr": false,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "bmi1": true,
-        "bmi2": true,
-        "kvm-pv-unhalt": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "clflushopt": true,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "arch-capabilities": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": false,
-        "kvm-hint-dedicated": false,
-        "lmce": false,
-        "perfctr-nb": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vme": false,
-        "vmx": false,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": false,
-        "tbm": false,
-        "wdt": false,
-        "model-id": "QEMU TCG CPU version 2.5+",
-        "sha-ni": false,
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-3"
-}
-
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "full",
-    "model": {
-      "name": "base",
-      "props": {
-        "cmov": true,
-        "ia64": false,
-        "ssb-no": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "ibrs-all": false,
-        "pause-filter": false,
-        "xsavec": false,
-        "intel-pt": false,
-        "kvm-asyncpf": false,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "avx512cd": false,
-        "decodeassists": false,
-        "sse4.1": true,
-        "family": 6,
-        "wbnoinvd": false,
-        "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": false,
-        "avx512vbmi2": false,
-        "cr8legacy": true,
-        "xcrypt-en": false,
-        "pn": false,
-        "rsba": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "pku": true,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": false,
-        "3dnowext": true,
-        "amd-no-ssb": false,
-        "npt": true,
-        "rdctl-no": false,
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": true,
-        "pfthreshold": false,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pae": true,
-        "pat": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "pcommit": true,
-        "syscall": true,
-        "avx512dq": false,
-        "svm": true,
-        "invtsc": false,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": false,
-        "kvm-pv-ipi": false,
-        "cx8": true,
-        "cldemote": false,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "avx512bitalg": false,
-        "pdcm": false,
-        "model": 6,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "skip-l1dfl-vmentry": false,
-        "fma": false,
-        "cx16": true,
-        "de": true,
-        "pconfig": false,
-        "stepping": 3,
-        "xsave": true,
-        "clflush": true,
-        "skinit": false,
-        "tsc": true,
-        "tce": false,
-        "fpu": true,
-        "ds-cpl": false,
-        "ibs": false,
-        "fma4": false,
-        "la57": true,
-        "osvw": false,
-        "apic": true,
-        "pmm": false,
-        "spec-ctrl": false,
-        "tsc-adjust": false,
-        "kvm-steal-time": false,
-        "kvmclock": false,
-        "lwp": false,
-        "amd-ssbd": false,
-        "xop": false,
-        "ibpb": false,
-        "avx": false,
-        "acpi": true,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "popcnt": true,
-        "vaes": false,
-        "xsaves": false,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "virt-ssbd": false,
-        "nodeid-msr": false,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "bmi1": true,
-        "bmi2": true,
-        "kvm-pv-unhalt": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "clflushopt": true,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "arch-capabilities": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": false,
-        "kvm-hint-dedicated": false,
-        "lmce": false,
-        "perfctr-nb": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vme": false,
-        "vmx": false,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": false,
-        "tbm": false,
-        "wdt": false,
-        "model-id": "QEMU TCG CPU version 2.5+",
-        "sha-ni": false,
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-4"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483658,
-        "cmov": true,
-        "ia64": false,
-        "ssb-no": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "ibrs-all": false,
-        "pause-filter": false,
-        "xsavec": false,
-        "intel-pt": false,
-        "hv-frequencies": false,
-        "tsc-frequency": 0,
-        "xd": true,
-        "hv-vendor-id": "",
-        "kvm-asyncpf": false,
-        "kvm_asyncpf": false,
-        "perfctr_core": false,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "decodeassists": false,
-        "avx512cd": false,
-        "sse4_1": true,
-        "sse4.1": true,
-        "sse4-1": true,
-        "family": 6,
-        "legacy-cache": true,
-        "vmware-cpuid-freq": true,
-        "wbnoinvd": false,
-        "avx512f": false,
-        "msr": true,
-        "mce": true,
-        "mca": true,
-        "hv-runtime": false,
-        "xcrypt": false,
-        "thread-id": -1,
-        "min-level": 13,
-        "xgetbv1": true,
-        "cid": false,
-        "hv-relaxed": false,
-        "hv-crash": false,
-        "ds": false,
-        "fxsr": true,
-        "xsaveopt": true,
-        "xtpr": false,
-        "hv-evmcs": false,
-        "avx512vl": false,
-        "avx512-vpopcntdq": false,
-        "phe": false,
-        "extapic": false,
-        "3dnowprefetch": false,
-        "avx512vbmi2": false,
-        "cr8legacy": true,
-        "cpuid-0xb": true,
-        "xcrypt-en": false,
-        "kvm_pv_eoi": false,
-        "apic-id": 4294967295,
-        "rsba": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "hv-ipi": false,
-        "pku": true,
-        "smx": false,
-        "cmp_legacy": false,
-        "cmp-legacy": false,
-        "node-id": -1,
-        "avx512-4fmaps": false,
-        "vmcb_clean": false,
-        "vmcb-clean": false,
-        "3dnowext": true,
-        "amd-no-ssb": false,
-        "hle": false,
-        "npt": true,
-        "rdctl-no": false,
-        "memory": "/machine/unattached/system[0]",
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm_lock": false,
-        "svm-lock": false,
-        "pfthreshold": false,
-        "smep": true,
-        "smap": true,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "hv-stimer": false,
-        "x-hv-synic-kvm-only": false,
-        "i64": true,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pat": true,
-        "pae": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm_nopiodelay": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "socket-id": -1,
-        "pcommit": true,
-        "syscall": true,
-        "level": 13,
-        "avx512dq": false,
-        "x-migrate-smi-count": true,
-        "svm": true,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
-        "invtsc": false,
-        "sse3": true,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-ipi": false,
-        "kvm-pv-eoi": false,
-        "cx8": true,
-        "cldemote": false,
-        "hv-reenlightenment": false,
-        "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": 6,
-        "nrip_save": false,
-        "nrip-save": false,
-        "kvm_pv_unhalt": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "skip-l1dfl-vmentry": false,
-        "fma": false,
-        "cx16": true,
-        "de": true,
-        "pconfig": false,
-        "enforce": false,
-        "stepping": 3,
-        "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": true,
-        "osvw": false,
-        "check": true,
-        "hv-spinlocks": -1,
-        "pmu": false,
-        "pmm": false,
-        "apic": true,
-        "spec-ctrl": false,
-        "min-xlevel2": 0,
-        "tsc-adjust": false,
-        "tsc_adjust": false,
-        "kvm-steal-time": false,
-        "kvm_steal_time": false,
-        "kvmclock": false,
-        "l3-cache": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "ibpb": false,
-        "xop": false,
-        "avx": false,
-        "ace2": false,
-        "avx512bw": false,
-        "acpi": true,
-        "hv-vapic": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "vaes": false,
-        "popcnt": true,
-        "xsaves": false,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "pclmuldq": true,
-        "virt-ssbd": false,
-        "x-hv-max-vps": -1,
-        "nodeid-msr": false,
-        "kvm": true,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "kvm-pv-unhalt": false,
-        "bmi2": true,
-        "bmi1": true,
-        "realized": false,
-        "tsc_scale": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "hv-vpindex": false,
-        "xlevel2": 0,
-        "clflushopt": true,
-        "kvm-no-smi-migration": false,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "arch-capabilities": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "lahf_lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "hv-synic": false,
-        "xstore": false,
-        "fxsr_opt": false,
-        "kvm-hint-dedicated": false,
-        "rtm": false,
-        "lmce": false,
-        "hv-time": false,
-        "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
-        "hv-tlbflush": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vmx": false,
-        "vme": false,
-        "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": "QEMU TCG CPU version 2.5+",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
+      "typename": "base-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "qemu64",
+      "typename": "qemu64-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "qemu32",
+      "typename": "qemu32-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "phenom",
+      "typename": "phenom-x86_64-cpu",
+      "unavailable-features": [
+        "fxsr-opt"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium3",
+      "typename": "pentium3-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium2",
+      "typename": "pentium2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium",
+      "typename": "pentium-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "n270",
+      "typename": "n270-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "kvm64",
+      "typename": "kvm64-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "kvm32",
+      "typename": "kvm32-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "coreduo",
+      "typename": "coreduo-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "core2duo",
+      "typename": "core2duo-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "athlon",
+      "typename": "athlon-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Westmere-IBRS",
+      "typename": "Westmere-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Westmere",
+      "typename": "Westmere-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Server-IBRS",
+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "spec-ctrl",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Server",
+      "typename": "Skylake-Server-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Client-IBRS",
+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "spec-ctrl",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Client",
+      "typename": "Skylake-Client-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "SandyBridge-IBRS",
+      "typename": "SandyBridge-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "SandyBridge",
+      "typename": "SandyBridge-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Penryn",
+      "typename": "Penryn-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G5",
+      "typename": "Opteron_G5-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "misalignsse",
+        "3dnowprefetch",
+        "xop",
+        "fma4",
+        "tbm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G4",
+      "typename": "Opteron_G4-x86_64-cpu",
+      "unavailable-features": [
+        "avx",
+        "misalignsse",
+        "3dnowprefetch",
+        "xop",
+        "fma4"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G3",
+      "typename": "Opteron_G3-x86_64-cpu",
+      "unavailable-features": [
+        "misalignsse"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G2",
+      "typename": "Opteron_G2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G1",
+      "typename": "Opteron_G1-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Nehalem-IBRS",
+      "typename": "Nehalem-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Nehalem",
+      "typename": "Nehalem-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "KnightsMill",
+      "typename": "KnightsMill-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "avx512f",
+        "rdseed",
+        "avx512pf",
+        "avx512er",
+        "avx512cd",
+        "avx512-vpopcntdq",
+        "avx512-4vnniw",
+        "avx512-4fmaps",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "IvyBridge-IBRS",
+      "typename": "IvyBridge-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "IvyBridge",
+      "typename": "IvyBridge-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Icelake-Server",
+      "typename": "Icelake-Server-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "intel-pt",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "avx512vbmi",
+        "umip",
+        "",
+        "avx512vbmi2",
+        "gfni",
+        "vaes",
+        "vpclmulqdq",
+        "avx512vnni",
+        "avx512bitalg",
+        "avx512-vpopcntdq",
+        "pconfig",
+        "spec-ctrl",
+        "ssbd",
+        "3dnowprefetch",
+        "wbnoinvd",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Icelake-Client",
+      "typename": "Icelake-Client-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "intel-pt",
+        "avx512vbmi",
+        "umip",
+        "",
+        "avx512vbmi2",
+        "gfni",
+        "vaes",
+        "vpclmulqdq",
+        "avx512vnni",
+        "avx512bitalg",
+        "avx512-vpopcntdq",
+        "spec-ctrl",
+        "ssbd",
+        "3dnowprefetch",
+        "wbnoinvd",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-noTSX-IBRS",
+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-noTSX",
+      "typename": "Haswell-noTSX-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-IBRS",
+      "typename": "Haswell-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell",
+      "typename": "Haswell-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "EPYC-IBPB",
+      "typename": "EPYC-IBPB-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "rdseed",
+        "sha-ni",
+        "fxsr-opt",
+        "misalignsse",
+        "3dnowprefetch",
+        "osvw",
+        "topoext",
+        "ibpb",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "EPYC",
+      "typename": "EPYC-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "rdseed",
+        "sha-ni",
+        "fxsr-opt",
+        "misalignsse",
+        "3dnowprefetch",
+        "osvw",
+        "topoext",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Conroe",
+      "typename": "Conroe-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Cascadelake-Server",
+      "typename": "Cascadelake-Server-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "intel-pt",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "",
+        "avx512vnni",
+        "spec-ctrl",
+        "ssbd",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-noTSX-IBRS",
+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid",
+        "rdseed",
+        "spec-ctrl",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-noTSX",
+      "typename": "Broadwell-noTSX-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid",
+        "rdseed",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-IBRS",
+      "typename": "Broadwell-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "spec-ctrl",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell",
+      "typename": "Broadwell-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "486",
+      "typename": "486-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
     }
-  },
-  "id": "libvirt-4"
+  ],
+  "id": "libvirt-2"
 }
 
 {
@@ -23528,13 +21878,10 @@
   "arguments": {
     "type": "static",
     "model": {
-      "name": "max",
-      "props": {
-        "migratable": false
-      }
+      "name": "max"
     }
   },
-  "id": "libvirt-5"
+  "id": "libvirt-3"
 }
 
 {
@@ -23736,13 +22083,25 @@
       }
     }
   },
-  "id": "libvirt-5"
+  "id": "libvirt-3"
 }
 
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
-    "type": "full",
+    "type": "static",
+    "model": {
+      "name": "max",
+      "props": {
+        "migratable": false
+      }
+    }
+  },
+  "id": "libvirt-4"
+}
+
+{
+  "return": {
     "model": {
       "name": "base",
       "props": {
@@ -23940,287 +22299,12 @@
       }
     }
   },
-  "id": "libvirt-6"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483658,
-        "cmov": true,
-        "ia64": false,
-        "ssb-no": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "ibrs-all": false,
-        "pause-filter": false,
-        "xsavec": false,
-        "intel-pt": false,
-        "hv-frequencies": false,
-        "tsc-frequency": 0,
-        "xd": true,
-        "hv-vendor-id": "",
-        "kvm-asyncpf": false,
-        "kvm_asyncpf": false,
-        "perfctr_core": false,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "decodeassists": false,
-        "avx512cd": false,
-        "sse4_1": true,
-        "sse4.1": true,
-        "sse4-1": true,
-        "family": 6,
-        "legacy-cache": true,
-        "vmware-cpuid-freq": true,
-        "wbnoinvd": false,
-        "avx512f": false,
-        "msr": true,
-        "mce": true,
-        "mca": true,
-        "hv-runtime": false,
-        "xcrypt": false,
-        "thread-id": -1,
-        "min-level": 13,
-        "xgetbv1": true,
-        "cid": false,
-        "hv-relaxed": false,
-        "hv-crash": false,
-        "ds": false,
-        "fxsr": true,
-        "xsaveopt": true,
-        "xtpr": false,
-        "hv-evmcs": false,
-        "avx512vl": false,
-        "avx512-vpopcntdq": false,
-        "phe": false,
-        "extapic": false,
-        "3dnowprefetch": false,
-        "avx512vbmi2": false,
-        "cr8legacy": true,
-        "cpuid-0xb": true,
-        "xcrypt-en": false,
-        "kvm_pv_eoi": false,
-        "apic-id": 4294967295,
-        "rsba": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "hv-ipi": false,
-        "pku": true,
-        "smx": false,
-        "cmp_legacy": false,
-        "cmp-legacy": false,
-        "node-id": -1,
-        "avx512-4fmaps": false,
-        "vmcb_clean": false,
-        "vmcb-clean": false,
-        "3dnowext": true,
-        "amd-no-ssb": false,
-        "hle": false,
-        "npt": true,
-        "rdctl-no": false,
-        "memory": "/machine/unattached/system[0]",
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm_lock": false,
-        "svm-lock": false,
-        "pfthreshold": false,
-        "smep": true,
-        "smap": true,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "hv-stimer": false,
-        "x-hv-synic-kvm-only": false,
-        "i64": true,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pat": true,
-        "pae": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm_nopiodelay": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "socket-id": -1,
-        "pcommit": true,
-        "syscall": true,
-        "level": 13,
-        "avx512dq": false,
-        "x-migrate-smi-count": true,
-        "svm": true,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
-        "invtsc": false,
-        "sse3": true,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-ipi": false,
-        "kvm-pv-eoi": false,
-        "cx8": true,
-        "cldemote": false,
-        "hv-reenlightenment": false,
-        "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": 6,
-        "nrip_save": false,
-        "nrip-save": false,
-        "kvm_pv_unhalt": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "skip-l1dfl-vmentry": false,
-        "fma": false,
-        "cx16": true,
-        "de": true,
-        "pconfig": false,
-        "enforce": false,
-        "stepping": 3,
-        "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": true,
-        "osvw": false,
-        "check": true,
-        "hv-spinlocks": -1,
-        "pmu": false,
-        "pmm": false,
-        "apic": true,
-        "spec-ctrl": false,
-        "min-xlevel2": 0,
-        "tsc-adjust": false,
-        "tsc_adjust": false,
-        "kvm-steal-time": false,
-        "kvm_steal_time": false,
-        "kvmclock": false,
-        "l3-cache": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "ibpb": false,
-        "xop": false,
-        "avx": false,
-        "ace2": false,
-        "avx512bw": false,
-        "acpi": true,
-        "hv-vapic": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "vaes": false,
-        "popcnt": true,
-        "xsaves": false,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "pclmuldq": true,
-        "virt-ssbd": false,
-        "x-hv-max-vps": -1,
-        "nodeid-msr": false,
-        "kvm": true,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "kvm-pv-unhalt": false,
-        "bmi2": true,
-        "bmi1": true,
-        "realized": false,
-        "tsc_scale": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "hv-vpindex": false,
-        "xlevel2": 0,
-        "clflushopt": true,
-        "kvm-no-smi-migration": false,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "arch-capabilities": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "lahf_lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "hv-synic": false,
-        "xstore": false,
-        "fxsr_opt": false,
-        "kvm-hint-dedicated": false,
-        "rtm": false,
-        "lmce": false,
-        "hv-time": false,
-        "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
-        "hv-tlbflush": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vmx": false,
-        "vme": false,
-        "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": "QEMU TCG CPU version 2.5+",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-6"
+  "id": "libvirt-4"
 }
 
 {
   "execute": "query-machines",
-  "id": "libvirt-7"
+  "id": "libvirt-5"
 }
 
 {
@@ -24439,5 +22523,5 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-5"
 }
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 514e5985ac..9e4a07b275 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -200,9 +200,6 @@
   <package>v3.1.0-rc2-48-g039d4e3df0</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
-    <property name='phys-bits' type='number' value='0'/>
-    <property name='core-id' type='number' value='-1'/>
-    <property name='xlevel' type='number' value='2147483656'/>
     <property name='cmov' type='boolean' value='true' migratable='yes'/>
     <property name='ia64' type='boolean' value='false'/>
     <property name='ssb-no' type='boolean' value='false'/>
@@ -215,42 +212,27 @@
     <property name='pause-filter' type='boolean' value='false'/>
     <property name='xsavec' type='boolean' value='true' migratable='yes'/>
     <property name='intel-pt' type='boolean' value='false'/>
-    <property name='hv-frequencies' type='boolean' value='false'/>
-    <property name='tsc-frequency' type='number' value='0'/>
-    <property name='xd' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-vendor-id' type='string' value=''/>
     <property name='kvm-asyncpf' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm_asyncpf' type='boolean' value='true' migratable='yes'/>
-    <property name='perfctr_core' type='boolean' value='false'/>
     <property name='perfctr-core' type='boolean' value='false'/>
     <property name='mpx' type='boolean' value='true' migratable='yes'/>
     <property name='pbe' type='boolean' value='false'/>
-    <property name='decodeassists' type='boolean' value='false'/>
     <property name='avx512cd' type='boolean' value='false'/>
-    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
+    <property name='decodeassists' type='boolean' value='false'/>
     <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
     <property name='family' type='number' value='6'/>
-    <property name='legacy-cache' type='boolean' value='true' migratable='yes'/>
-    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
     <property name='wbnoinvd' type='boolean' value='false'/>
     <property name='avx512f' type='boolean' value='false'/>
     <property name='msr' type='boolean' value='true' migratable='yes'/>
     <property name='mce' type='boolean' value='true' migratable='yes'/>
     <property name='mca' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-runtime' type='boolean' value='false'/>
     <property name='xcrypt' type='boolean' value='false'/>
-    <property name='thread-id' type='number' value='-1'/>
     <property name='min-level' type='number' value='13'/>
     <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
     <property name='cid' type='boolean' value='false'/>
-    <property name='hv-relaxed' type='boolean' value='false'/>
-    <property name='hv-crash' type='boolean' value='false'/>
     <property name='ds' type='boolean' value='false'/>
     <property name='fxsr' type='boolean' value='true' migratable='yes'/>
     <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
     <property name='xtpr' type='boolean' value='false'/>
-    <property name='hv-evmcs' type='boolean' value='false'/>
     <property name='avx512vl' type='boolean' value='false'/>
     <property name='avx512-vpopcntdq' type='boolean' value='false'/>
     <property name='phe' type='boolean' value='false'/>
@@ -258,93 +240,66 @@
     <property name='3dnowprefetch' type='boolean' value='true' migratable='yes'/>
     <property name='avx512vbmi2' type='boolean' value='false'/>
     <property name='cr8legacy' type='boolean' value='false'/>
-    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
     <property name='xcrypt-en' type='boolean' value='false'/>
-    <property name='kvm_pv_eoi' type='boolean' value='true' migratable='yes'/>
-    <property name='apic-id' type='number' value='4294967295'/>
-    <property name='rsba' type='boolean' value='false'/>
     <property name='pn' type='boolean' value='false'/>
+    <property name='rsba' type='boolean' value='false'/>
     <property name='dca' type='boolean' value='false'/>
     <property name='vendor' type='string' value='GenuineIntel'/>
-    <property name='hv-ipi' type='boolean' value='false'/>
     <property name='pku' type='boolean' value='false'/>
     <property name='smx' type='boolean' value='false'/>
-    <property name='cmp_legacy' type='boolean' value='false'/>
     <property name='cmp-legacy' type='boolean' value='false'/>
-    <property name='node-id' type='number' value='-1'/>
     <property name='avx512-4fmaps' type='boolean' value='false'/>
-    <property name='vmcb_clean' type='boolean' value='false'/>
     <property name='vmcb-clean' type='boolean' value='false'/>
+    <property name='hle' type='boolean' value='true' migratable='yes'/>
     <property name='3dnowext' type='boolean' value='false'/>
     <property name='amd-no-ssb' type='boolean' value='false'/>
-    <property name='hle' type='boolean' value='true' migratable='yes'/>
     <property name='npt' type='boolean' value='false'/>
     <property name='rdctl-no' type='boolean' value='false'/>
-    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
     <property name='clwb' type='boolean' value='false'/>
     <property name='lbrv' type='boolean' value='false'/>
     <property name='adx' type='boolean' value='true' migratable='yes'/>
     <property name='ss' type='boolean' value='true' migratable='yes'/>
     <property name='pni' type='boolean' value='true' migratable='yes'/>
-    <property name='svm_lock' type='boolean' value='false'/>
     <property name='svm-lock' type='boolean' value='false'/>
-    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='smep' type='boolean' value='true' migratable='yes'/>
     <property name='smap' type='boolean' value='true' migratable='yes'/>
+    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='x2apic' type='boolean' value='true' migratable='yes'/>
     <property name='avx512vbmi' type='boolean' value='false'/>
     <property name='avx512vnni' type='boolean' value='false'/>
-    <property name='hv-stimer' type='boolean' value='false'/>
-    <property name='x-hv-synic-kvm-only' type='boolean' value='false'/>
-    <property name='i64' type='boolean' value='true' migratable='yes'/>
     <property name='flushbyasid' type='boolean' value='false'/>
     <property name='f16c' type='boolean' value='true' migratable='yes'/>
     <property name='ace2-en' type='boolean' value='false'/>
-    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='pae' type='boolean' value='true' migratable='yes'/>
+    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='sse' type='boolean' value='true' migratable='yes'/>
     <property name='phe-en' type='boolean' value='false'/>
-    <property name='kvm_nopiodelay' type='boolean' value='true' migratable='yes'/>
     <property name='kvm-nopiodelay' type='boolean' value='true' migratable='yes'/>
     <property name='tm' type='boolean' value='false'/>
     <property name='kvmclock-stable-bit' type='boolean' value='true' migratable='yes'/>
     <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-    <property name='socket-id' type='number' value='-1'/>
     <property name='pcommit' type='boolean' value='false'/>
     <property name='syscall' type='boolean' value='true' migratable='yes'/>
-    <property name='level' type='number' value='13'/>
     <property name='avx512dq' type='boolean' value='false'/>
-    <property name='x-migrate-smi-count' type='boolean' value='true' migratable='yes'/>
     <property name='svm' type='boolean' value='false'/>
-    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-reset' type='boolean' value='false'/>
     <property name='invtsc' type='boolean' value='true' migratable='no'/>
-    <property name='sse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse2' type='boolean' value='true' migratable='yes'/>
     <property name='ssbd' type='boolean' value='false'/>
     <property name='est' type='boolean' value='false'/>
     <property name='avx512ifma' type='boolean' value='false'/>
     <property name='tm2' type='boolean' value='false'/>
-    <property name='kvm-pv-ipi' type='boolean' value='false'/>
     <property name='kvm-pv-eoi' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-pv-ipi' type='boolean' value='false'/>
     <property name='cx8' type='boolean' value='true' migratable='yes'/>
     <property name='cldemote' type='boolean' value='false'/>
-    <property name='hv-reenlightenment' type='boolean' value='false'/>
-    <property name='kvm_mmu' type='boolean' value='false'/>
     <property name='kvm-mmu' type='boolean' value='false'/>
-    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
     <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
     <property name='pge' type='boolean' value='true' migratable='yes'/>
-    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
     <property name='avx512bitalg' type='boolean' value='false'/>
-    <property name='nodeid_msr' type='boolean' value='false'/>
     <property name='pdcm' type='boolean' value='false'/>
-    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='model' type='number' value='94'/>
-    <property name='nrip_save' type='boolean' value='false'/>
+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='nrip-save' type='boolean' value='false'/>
-    <property name='kvm_pv_unhalt' type='boolean' value='true' migratable='yes'/>
     <property name='ssse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse4a' type='boolean' value='false'/>
     <property name='invpcid' type='boolean' value='true' migratable='yes'/>
@@ -355,7 +310,6 @@
     <property name='cx16' type='boolean' value='true' migratable='yes'/>
     <property name='de' type='boolean' value='true' migratable='yes'/>
     <property name='pconfig' type='boolean' value='false'/>
-    <property name='enforce' type='boolean' value='false'/>
     <property name='stepping' type='number' value='3'/>
     <property name='xsave' type='boolean' value='true' migratable='yes'/>
     <property name='clflush' type='boolean' value='true' migratable='yes'/>
@@ -363,67 +317,48 @@
     <property name='tsc' type='boolean' value='true' migratable='yes'/>
     <property name='tce' type='boolean' value='false'/>
     <property name='fpu' type='boolean' value='true' migratable='yes'/>
-    <property name='ibs' type='boolean' value='false'/>
-    <property name='ds_cpl' type='boolean' value='false'/>
     <property name='ds-cpl' type='boolean' value='false'/>
-    <property name='host-phys-bits' type='boolean' value='false'/>
+    <property name='ibs' type='boolean' value='false'/>
     <property name='fma4' type='boolean' value='false'/>
     <property name='la57' type='boolean' value='false'/>
     <property name='osvw' type='boolean' value='false'/>
-    <property name='check' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-spinlocks' type='number' value='-1'/>
-    <property name='pmu' type='boolean' value='false'/>
-    <property name='pmm' type='boolean' value='false'/>
     <property name='apic' type='boolean' value='true' migratable='yes'/>
+    <property name='pmm' type='boolean' value='false'/>
     <property name='spec-ctrl' type='boolean' value='true' migratable='yes'/>
-    <property name='min-xlevel2' type='number' value='0'/>
     <property name='tsc-adjust' type='boolean' value='true' migratable='yes'/>
-    <property name='tsc_adjust' type='boolean' value='true' migratable='yes'/>
     <property name='kvm-steal-time' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm_steal_time' type='boolean' value='true' migratable='yes'/>
     <property name='kvmclock' type='boolean' value='true' migratable='yes'/>
-    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
     <property name='lwp' type='boolean' value='false'/>
     <property name='amd-ssbd' type='boolean' value='false'/>
-    <property name='ibpb' type='boolean' value='false'/>
     <property name='xop' type='boolean' value='false'/>
+    <property name='ibpb' type='boolean' value='false'/>
     <property name='avx' type='boolean' value='true' migratable='yes'/>
-    <property name='ace2' type='boolean' value='false'/>
-    <property name='avx512bw' type='boolean' value='false'/>
     <property name='acpi' type='boolean' value='false'/>
-    <property name='hv-vapic' type='boolean' value='false'/>
+    <property name='avx512bw' type='boolean' value='false'/>
+    <property name='ace2' type='boolean' value='false'/>
     <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
     <property name='ht' type='boolean' value='false'/>
     <property name='nx' type='boolean' value='true' migratable='yes'/>
     <property name='pclmulqdq' type='boolean' value='true' migratable='yes'/>
     <property name='mmxext' type='boolean' value='false'/>
-    <property name='vaes' type='boolean' value='false'/>
     <property name='popcnt' type='boolean' value='true' migratable='yes'/>
+    <property name='vaes' type='boolean' value='false'/>
     <property name='xsaves' type='boolean' value='true' migratable='yes'/>
-    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
     <property name='lm' type='boolean' value='true' migratable='yes'/>
     <property name='umip' type='boolean' value='true' migratable='yes'/>
     <property name='pse' type='boolean' value='true' migratable='yes'/>
     <property name='avx2' type='boolean' value='true' migratable='yes'/>
     <property name='sep' type='boolean' value='true' migratable='yes'/>
-    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
     <property name='virt-ssbd' type='boolean' value='false'/>
-    <property name='x-hv-max-vps' type='number' value='-1'/>
     <property name='nodeid-msr' type='boolean' value='false'/>
-    <property name='kvm' type='boolean' value='true' migratable='yes'/>
     <property name='misalignsse' type='boolean' value='false'/>
     <property name='min-xlevel' type='number' value='2147483656'/>
-    <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/>
-    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
     <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-    <property name='realized' type='boolean' value='false'/>
-    <property name='tsc_scale' type='boolean' value='false'/>
+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/>
     <property name='tsc-scale' type='boolean' value='false'/>
     <property name='topoext' type='boolean' value='false'/>
-    <property name='hv-vpindex' type='boolean' value='false'/>
-    <property name='xlevel2' type='number' value='0'/>
     <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
     <property name='monitor' type='boolean' value='false'/>
     <property name='avx512er' type='boolean' value='false'/>
     <property name='pmm-en' type='boolean' value='false'/>
@@ -432,25 +367,18 @@
     <property name='3dnow' type='boolean' value='false'/>
     <property name='erms' type='boolean' value='true' migratable='yes'/>
     <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
     <property name='vpclmulqdq' type='boolean' value='false'/>
     <property name='fxsr-opt' type='boolean' value='false'/>
-    <property name='hv-synic' type='boolean' value='false'/>
     <property name='xstore' type='boolean' value='false'/>
-    <property name='fxsr_opt' type='boolean' value='false'/>
-    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
     <property name='rtm' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
     <property name='lmce' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-time' type='boolean' value='false'/>
     <property name='perfctr-nb' type='boolean' value='false'/>
-    <property name='perfctr_nb' type='boolean' value='false'/>
-    <property name='ffxsr' type='boolean' value='false'/>
-    <property name='hv-tlbflush' type='boolean' value='false'/>
     <property name='rdrand' type='boolean' value='true' migratable='yes'/>
     <property name='rdseed' type='boolean' value='true' migratable='yes'/>
     <property name='avx512-4vnniw' type='boolean' value='false'/>
-    <property name='vmx' type='boolean' value='true' migratable='yes'/>
     <property name='vme' type='boolean' value='true' migratable='yes'/>
+    <property name='vmx' type='boolean' value='true' migratable='yes'/>
     <property name='dtes64' type='boolean' value='false'/>
     <property name='mtrr' type='boolean' value='true' migratable='yes'/>
     <property name='rdtscp' type='boolean' value='true' migratable='yes'/>
@@ -458,9 +386,8 @@
     <property name='kvm-pv-tlb-flush' type='boolean' value='true' migratable='yes'/>
     <property name='tbm' type='boolean' value='false'/>
     <property name='wdt' type='boolean' value='false'/>
-    <property name='pause_filter' type='boolean' value='false'/>
-    <property name='sha-ni' type='boolean' value='false'/>
     <property name='model-id' type='string' value='Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz'/>
+    <property name='sha-ni' type='boolean' value='false'/>
     <property name='abm' type='boolean' value='true' migratable='yes'/>
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
@@ -690,9 +617,6 @@
   <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
   <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
   <hostCPU type='tcg' model='base' migratability='yes'>
-    <property name='phys-bits' type='number' value='0'/>
-    <property name='core-id' type='number' value='-1'/>
-    <property name='xlevel' type='number' value='2147483658'/>
     <property name='cmov' type='boolean' value='true' migratable='yes'/>
     <property name='ia64' type='boolean' value='false'/>
     <property name='ssb-no' type='boolean' value='false'/>
@@ -705,42 +629,27 @@
     <property name='pause-filter' type='boolean' value='false'/>
     <property name='xsavec' type='boolean' value='false'/>
     <property name='intel-pt' type='boolean' value='false'/>
-    <property name='hv-frequencies' type='boolean' value='false'/>
-    <property name='tsc-frequency' type='number' value='0'/>
-    <property name='xd' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-vendor-id' type='string' value=''/>
     <property name='kvm-asyncpf' type='boolean' value='false'/>
-    <property name='kvm_asyncpf' type='boolean' value='false'/>
-    <property name='perfctr_core' type='boolean' value='false'/>
     <property name='perfctr-core' type='boolean' value='false'/>
     <property name='mpx' type='boolean' value='true' migratable='yes'/>
     <property name='pbe' type='boolean' value='false'/>
-    <property name='decodeassists' type='boolean' value='false'/>
     <property name='avx512cd' type='boolean' value='false'/>
-    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
+    <property name='decodeassists' type='boolean' value='false'/>
     <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
     <property name='family' type='number' value='6'/>
-    <property name='legacy-cache' type='boolean' value='true' migratable='yes'/>
-    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
     <property name='wbnoinvd' type='boolean' value='false'/>
     <property name='avx512f' type='boolean' value='false'/>
     <property name='msr' type='boolean' value='true' migratable='yes'/>
     <property name='mce' type='boolean' value='true' migratable='yes'/>
     <property name='mca' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-runtime' type='boolean' value='false'/>
     <property name='xcrypt' type='boolean' value='false'/>
-    <property name='thread-id' type='number' value='-1'/>
     <property name='min-level' type='number' value='13'/>
     <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
     <property name='cid' type='boolean' value='false'/>
-    <property name='hv-relaxed' type='boolean' value='false'/>
-    <property name='hv-crash' type='boolean' value='false'/>
     <property name='ds' type='boolean' value='false'/>
     <property name='fxsr' type='boolean' value='true' migratable='yes'/>
     <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
     <property name='xtpr' type='boolean' value='false'/>
-    <property name='hv-evmcs' type='boolean' value='false'/>
     <property name='avx512vl' type='boolean' value='false'/>
     <property name='avx512-vpopcntdq' type='boolean' value='false'/>
     <property name='phe' type='boolean' value='false'/>
@@ -748,93 +657,66 @@
     <property name='3dnowprefetch' type='boolean' value='false'/>
     <property name='avx512vbmi2' type='boolean' value='false'/>
     <property name='cr8legacy' type='boolean' value='true' migratable='yes'/>
-    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
     <property name='xcrypt-en' type='boolean' value='false'/>
-    <property name='kvm_pv_eoi' type='boolean' value='false'/>
-    <property name='apic-id' type='number' value='4294967295'/>
-    <property name='rsba' type='boolean' value='false'/>
     <property name='pn' type='boolean' value='false'/>
+    <property name='rsba' type='boolean' value='false'/>
     <property name='dca' type='boolean' value='false'/>
     <property name='vendor' type='string' value='AuthenticAMD'/>
-    <property name='hv-ipi' type='boolean' value='false'/>
     <property name='pku' type='boolean' value='true' migratable='yes'/>
     <property name='smx' type='boolean' value='false'/>
-    <property name='cmp_legacy' type='boolean' value='false'/>
     <property name='cmp-legacy' type='boolean' value='false'/>
-    <property name='node-id' type='number' value='-1'/>
     <property name='avx512-4fmaps' type='boolean' value='false'/>
-    <property name='vmcb_clean' type='boolean' value='false'/>
     <property name='vmcb-clean' type='boolean' value='false'/>
+    <property name='hle' type='boolean' value='false'/>
     <property name='3dnowext' type='boolean' value='true' migratable='yes'/>
     <property name='amd-no-ssb' type='boolean' value='false'/>
-    <property name='hle' type='boolean' value='false'/>
     <property name='npt' type='boolean' value='true' migratable='yes'/>
     <property name='rdctl-no' type='boolean' value='false'/>
-    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
     <property name='clwb' type='boolean' value='true' migratable='yes'/>
     <property name='lbrv' type='boolean' value='false'/>
     <property name='adx' type='boolean' value='true' migratable='yes'/>
     <property name='ss' type='boolean' value='true' migratable='yes'/>
     <property name='pni' type='boolean' value='true' migratable='yes'/>
-    <property name='svm_lock' type='boolean' value='false'/>
     <property name='svm-lock' type='boolean' value='false'/>
-    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='smep' type='boolean' value='true' migratable='yes'/>
     <property name='smap' type='boolean' value='true' migratable='yes'/>
+    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='x2apic' type='boolean' value='false'/>
     <property name='avx512vbmi' type='boolean' value='false'/>
     <property name='avx512vnni' type='boolean' value='false'/>
-    <property name='hv-stimer' type='boolean' value='false'/>
-    <property name='x-hv-synic-kvm-only' type='boolean' value='false'/>
-    <property name='i64' type='boolean' value='true' migratable='yes'/>
     <property name='flushbyasid' type='boolean' value='false'/>
     <property name='f16c' type='boolean' value='false'/>
     <property name='ace2-en' type='boolean' value='false'/>
-    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='pae' type='boolean' value='true' migratable='yes'/>
+    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='sse' type='boolean' value='true' migratable='yes'/>
     <property name='phe-en' type='boolean' value='false'/>
-    <property name='kvm_nopiodelay' type='boolean' value='false'/>
     <property name='kvm-nopiodelay' type='boolean' value='false'/>
     <property name='tm' type='boolean' value='false'/>
     <property name='kvmclock-stable-bit' type='boolean' value='false'/>
     <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-    <property name='socket-id' type='number' value='-1'/>
     <property name='pcommit' type='boolean' value='true' migratable='yes'/>
     <property name='syscall' type='boolean' value='true' migratable='yes'/>
-    <property name='level' type='number' value='13'/>
     <property name='avx512dq' type='boolean' value='false'/>
-    <property name='x-migrate-smi-count' type='boolean' value='true' migratable='yes'/>
     <property name='svm' type='boolean' value='true' migratable='yes'/>
-    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-reset' type='boolean' value='false'/>
     <property name='invtsc' type='boolean' value='false'/>
-    <property name='sse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse2' type='boolean' value='true' migratable='yes'/>
     <property name='ssbd' type='boolean' value='false'/>
     <property name='est' type='boolean' value='false'/>
     <property name='avx512ifma' type='boolean' value='false'/>
     <property name='tm2' type='boolean' value='false'/>
-    <property name='kvm-pv-ipi' type='boolean' value='false'/>
     <property name='kvm-pv-eoi' type='boolean' value='false'/>
+    <property name='kvm-pv-ipi' type='boolean' value='false'/>
     <property name='cx8' type='boolean' value='true' migratable='yes'/>
     <property name='cldemote' type='boolean' value='false'/>
-    <property name='hv-reenlightenment' type='boolean' value='false'/>
-    <property name='kvm_mmu' type='boolean' value='false'/>
     <property name='kvm-mmu' type='boolean' value='false'/>
-    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
     <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
     <property name='pge' type='boolean' value='true' migratable='yes'/>
-    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
     <property name='avx512bitalg' type='boolean' value='false'/>
-    <property name='nodeid_msr' type='boolean' value='false'/>
     <property name='pdcm' type='boolean' value='false'/>
-    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='model' type='number' value='6'/>
-    <property name='nrip_save' type='boolean' value='false'/>
+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='nrip-save' type='boolean' value='false'/>
-    <property name='kvm_pv_unhalt' type='boolean' value='false'/>
     <property name='ssse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse4a' type='boolean' value='true' migratable='yes'/>
     <property name='invpcid' type='boolean' value='false'/>
@@ -845,7 +727,6 @@
     <property name='cx16' type='boolean' value='true' migratable='yes'/>
     <property name='de' type='boolean' value='true' migratable='yes'/>
     <property name='pconfig' type='boolean' value='false'/>
-    <property name='enforce' type='boolean' value='false'/>
     <property name='stepping' type='number' value='3'/>
     <property name='xsave' type='boolean' value='true' migratable='yes'/>
     <property name='clflush' type='boolean' value='true' migratable='yes'/>
@@ -853,67 +734,48 @@
     <property name='tsc' type='boolean' value='true' migratable='yes'/>
     <property name='tce' type='boolean' value='false'/>
     <property name='fpu' type='boolean' value='true' migratable='yes'/>
-    <property name='ibs' type='boolean' value='false'/>
-    <property name='ds_cpl' type='boolean' value='false'/>
     <property name='ds-cpl' type='boolean' value='false'/>
-    <property name='host-phys-bits' type='boolean' value='false'/>
+    <property name='ibs' type='boolean' value='false'/>
     <property name='fma4' type='boolean' value='false'/>
     <property name='la57' type='boolean' value='true' migratable='yes'/>
     <property name='osvw' type='boolean' value='false'/>
-    <property name='check' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-spinlocks' type='number' value='-1'/>
-    <property name='pmu' type='boolean' value='false'/>
-    <property name='pmm' type='boolean' value='false'/>
     <property name='apic' type='boolean' value='true' migratable='yes'/>
+    <property name='pmm' type='boolean' value='false'/>
     <property name='spec-ctrl' type='boolean' value='false'/>
-    <property name='min-xlevel2' type='number' value='0'/>
     <property name='tsc-adjust' type='boolean' value='false'/>
-    <property name='tsc_adjust' type='boolean' value='false'/>
     <property name='kvm-steal-time' type='boolean' value='false'/>
-    <property name='kvm_steal_time' type='boolean' value='false'/>
     <property name='kvmclock' type='boolean' value='false'/>
-    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
     <property name='lwp' type='boolean' value='false'/>
     <property name='amd-ssbd' type='boolean' value='false'/>
-    <property name='ibpb' type='boolean' value='false'/>
     <property name='xop' type='boolean' value='false'/>
+    <property name='ibpb' type='boolean' value='false'/>
     <property name='avx' type='boolean' value='false'/>
-    <property name='ace2' type='boolean' value='false'/>
-    <property name='avx512bw' type='boolean' value='false'/>
     <property name='acpi' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-vapic' type='boolean' value='false'/>
+    <property name='avx512bw' type='boolean' value='false'/>
+    <property name='ace2' type='boolean' value='false'/>
     <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
     <property name='ht' type='boolean' value='false'/>
     <property name='nx' type='boolean' value='true' migratable='yes'/>
     <property name='pclmulqdq' type='boolean' value='true' migratable='yes'/>
     <property name='mmxext' type='boolean' value='true' migratable='yes'/>
-    <property name='vaes' type='boolean' value='false'/>
     <property name='popcnt' type='boolean' value='true' migratable='yes'/>
+    <property name='vaes' type='boolean' value='false'/>
     <property name='xsaves' type='boolean' value='false'/>
-    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
     <property name='lm' type='boolean' value='true' migratable='yes'/>
     <property name='umip' type='boolean' value='false'/>
     <property name='pse' type='boolean' value='true' migratable='yes'/>
     <property name='avx2' type='boolean' value='false'/>
     <property name='sep' type='boolean' value='true' migratable='yes'/>
-    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
     <property name='virt-ssbd' type='boolean' value='false'/>
-    <property name='x-hv-max-vps' type='number' value='-1'/>
     <property name='nodeid-msr' type='boolean' value='false'/>
-    <property name='kvm' type='boolean' value='true' migratable='yes'/>
     <property name='misalignsse' type='boolean' value='false'/>
     <property name='min-xlevel' type='number' value='2147483658'/>
-    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
-    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
     <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-    <property name='realized' type='boolean' value='false'/>
-    <property name='tsc_scale' type='boolean' value='false'/>
+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
     <property name='tsc-scale' type='boolean' value='false'/>
     <property name='topoext' type='boolean' value='false'/>
-    <property name='hv-vpindex' type='boolean' value='false'/>
-    <property name='xlevel2' type='number' value='0'/>
     <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
     <property name='monitor' type='boolean' value='true' migratable='yes'/>
     <property name='avx512er' type='boolean' value='false'/>
     <property name='pmm-en' type='boolean' value='false'/>
@@ -922,25 +784,18 @@
     <property name='3dnow' type='boolean' value='true' migratable='yes'/>
     <property name='erms' type='boolean' value='true' migratable='yes'/>
     <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
     <property name='vpclmulqdq' type='boolean' value='false'/>
     <property name='fxsr-opt' type='boolean' value='false'/>
-    <property name='hv-synic' type='boolean' value='false'/>
     <property name='xstore' type='boolean' value='false'/>
-    <property name='fxsr_opt' type='boolean' value='false'/>
-    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
     <property name='rtm' type='boolean' value='false'/>
+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
     <property name='lmce' type='boolean' value='false'/>
-    <property name='hv-time' type='boolean' value='false'/>
     <property name='perfctr-nb' type='boolean' value='false'/>
-    <property name='perfctr_nb' type='boolean' value='false'/>
-    <property name='ffxsr' type='boolean' value='false'/>
-    <property name='hv-tlbflush' type='boolean' value='false'/>
     <property name='rdrand' type='boolean' value='false'/>
     <property name='rdseed' type='boolean' value='false'/>
     <property name='avx512-4vnniw' type='boolean' value='false'/>
-    <property name='vmx' type='boolean' value='false'/>
     <property name='vme' type='boolean' value='false'/>
+    <property name='vmx' type='boolean' value='false'/>
     <property name='dtes64' type='boolean' value='false'/>
     <property name='mtrr' type='boolean' value='true' migratable='yes'/>
     <property name='rdtscp' type='boolean' value='true' migratable='yes'/>
@@ -948,9 +803,8 @@
     <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
     <property name='tbm' type='boolean' value='false'/>
     <property name='wdt' type='boolean' value='false'/>
-    <property name='pause_filter' type='boolean' value='false'/>
-    <property name='sha-ni' type='boolean' value='false'/>
     <property name='model-id' type='string' value='QEMU TCG CPU version 2.5+'/>
+    <property name='sha-ni' type='boolean' value='false'/>
     <property name='abm' type='boolean' value='true' migratable='yes'/>
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
index 5de9457eed..87e928425f 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
@@ -21462,7 +21462,19 @@
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
-    "type": "full",
+    "type": "static",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false
+      }
+    }
+  },
+  "id": "libvirt-49"
+}
+
+{
+  "return": {
     "model": {
       "name": "base",
       "props": {
@@ -21549,7 +21561,7 @@
         "syscall": true,
         "avx512dq": false,
         "svm": false,
-        "invtsc": false,
+        "invtsc": true,
         "sse2": true,
         "ssbd": true,
         "est": false,
@@ -21665,2422 +21677,740 @@
   "id": "libvirt-49"
 }
 
+{
+  "execute": "qmp_capabilities",
+  "id": "libvirt-1"
+}
+
 {
   "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483656,
-        "cmov": true,
-        "ia64": false,
-        "ssb-no": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "ibrs-all": false,
-        "pause-filter": false,
-        "xsavec": true,
-        "intel-pt": false,
-        "hv-frequencies": false,
-        "tsc-frequency": 0,
-        "xd": true,
-        "x-intel-pt-auto-level": true,
-        "hv-vendor-id": "",
-        "kvm-asyncpf": true,
-        "kvm_asyncpf": true,
-        "perfctr_core": false,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "decodeassists": false,
-        "avx512cd": false,
-        "sse4_1": true,
-        "sse4.1": true,
-        "sse4-1": true,
-        "family": 6,
-        "legacy-cache": true,
-        "host-phys-bits-limit": 0,
-        "vmware-cpuid-freq": true,
-        "wbnoinvd": false,
-        "avx512f": false,
-        "msr": true,
-        "mce": true,
-        "mca": true,
-        "hv-runtime": false,
-        "xcrypt": false,
-        "thread-id": -1,
-        "min-level": 13,
-        "xgetbv1": true,
-        "cid": false,
-        "hv-relaxed": false,
-        "hv-crash": false,
-        "ds": false,
-        "fxsr": true,
-        "xsaveopt": true,
-        "xtpr": false,
-        "hv-evmcs": false,
-        "avx512vl": false,
-        "avx512-vpopcntdq": false,
-        "phe": false,
-        "extapic": false,
-        "3dnowprefetch": true,
-        "avx512vbmi2": false,
-        "cr8legacy": false,
-        "stibp": false,
-        "cpuid-0xb": true,
-        "xcrypt-en": false,
-        "kvm_pv_eoi": true,
-        "apic-id": 4294967295,
-        "rsba": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "GenuineIntel",
-        "hv-ipi": false,
-        "pku": false,
-        "smx": false,
-        "cmp_legacy": false,
-        "cmp-legacy": false,
-        "node-id": -1,
-        "avx512-4fmaps": false,
-        "vmcb_clean": false,
-        "vmcb-clean": false,
-        "3dnowext": false,
-        "amd-no-ssb": false,
-        "hle": true,
-        "npt": false,
-        "rdctl-no": false,
-        "memory": "/machine/unattached/system[0]",
-        "clwb": false,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm_lock": false,
-        "svm-lock": false,
-        "pfthreshold": false,
-        "smep": true,
-        "smap": true,
-        "x2apic": true,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "hv-stimer": false,
-        "x-hv-synic-kvm-only": 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,
-        "x-migrate-smi-count": true,
-        "svm": false,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
-        "invtsc": false,
-        "sse3": true,
-        "sse2": true,
-        "ssbd": true,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-ipi": true,
-        "kvm-pv-eoi": true,
-        "cx8": true,
-        "cldemote": false,
-        "hv-reenlightenment": false,
-        "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": 94,
-        "nrip_save": false,
-        "nrip-save": false,
-        "kvm_pv_unhalt": true,
-        "ssse3": true,
-        "sse4a": false,
-        "invpcid": true,
-        "pdpe1gb": true,
-        "tsc-deadline": true,
-        "skip-l1dfl-vmentry": true,
-        "fma": true,
-        "cx16": true,
-        "de": true,
-        "enforce": false,
-        "stepping": 3,
-        "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": true,
-        "min-xlevel2": 0,
-        "tsc-adjust": true,
-        "tsc_adjust": true,
-        "kvm-steal-time": true,
-        "kvm_steal_time": true,
-        "kvmclock": true,
-        "l3-cache": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "ibpb": false,
-        "xop": false,
-        "avx": true,
-        "movdiri": 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": true,
-        "movdir64b": false,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": true,
-        "pse": true,
-        "avx2": true,
-        "sep": true,
-        "pclmuldq": true,
-        "virt-ssbd": false,
-        "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": true,
-        "kvm-no-smi-migration": false,
-        "monitor": false,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": true,
-        "arch-capabilities": false,
-        "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": false,
-        "rtm": true,
-        "lmce": true,
-        "hv-time": false,
-        "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
-        "hv-tlbflush": false,
-        "rdrand": true,
-        "rdseed": true,
-        "avx512-4vnniw": false,
-        "vmx": true,
-        "vme": true,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": true,
-        "tbm": false,
-        "wdt": false,
-        "pause_filter": false,
-        "sha-ni": false,
-        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-1"
 }
 
 {
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "host",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-50"
+  "execute": "query-cpu-definitions",
+  "id": "libvirt-2"
 }
 
 {
-  "return": {
-    "model": {
+  "return": [
+    {
+      "name": "max",
+      "typename": "max-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": false
+    },
+    {
+      "name": "host",
+      "typename": "host-x86_64-cpu",
+      "unavailable-features": [
+        "kvm"
+      ],
+      "static": false,
+      "migration-safe": false
+    },
+    {
       "name": "base",
-      "props": {
-        "cmov": true,
-        "ia64": false,
-        "ssb-no": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "ibrs-all": false,
-        "pause-filter": false,
-        "xsavec": true,
-        "intel-pt": false,
-        "kvm-asyncpf": true,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "avx512cd": false,
-        "decodeassists": false,
-        "sse4.1": true,
-        "family": 6,
-        "wbnoinvd": false,
-        "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,
-        "avx512vbmi2": false,
-        "cr8legacy": false,
-        "stibp": false,
-        "xcrypt-en": false,
-        "pn": false,
-        "rsba": false,
-        "dca": false,
-        "vendor": "GenuineIntel",
-        "pku": false,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": true,
-        "3dnowext": false,
-        "amd-no-ssb": false,
-        "npt": false,
-        "rdctl-no": false,
-        "clwb": false,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": true,
-        "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": true,
-        "sse2": true,
-        "ssbd": true,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": true,
-        "kvm-pv-ipi": true,
-        "cx8": true,
-        "cldemote": false,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "avx512bitalg": false,
-        "pdcm": false,
-        "model": 94,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": false,
-        "invpcid": true,
-        "pdpe1gb": true,
-        "tsc-deadline": true,
-        "skip-l1dfl-vmentry": 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,
-        "spec-ctrl": true,
-        "tsc-adjust": true,
-        "kvm-steal-time": true,
-        "kvmclock": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "xop": false,
-        "ibpb": false,
-        "avx": true,
-        "movdiri": false,
-        "acpi": false,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": false,
-        "popcnt": true,
-        "vaes": false,
-        "movdir64b": false,
-        "xsaves": true,
-        "lm": true,
-        "umip": true,
-        "pse": true,
-        "avx2": true,
-        "sep": true,
-        "virt-ssbd": false,
-        "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,
-        "arch-capabilities": false,
-        "3dnow": false,
-        "erms": true,
-        "lahf-lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": true,
-        "kvm-hint-dedicated": false,
-        "lmce": true,
-        "perfctr-nb": false,
-        "rdrand": true,
-        "rdseed": true,
-        "avx512-4vnniw": false,
-        "vme": true,
-        "vmx": true,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": 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-50"
-}
-
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "full",
-    "model": {
-      "name": "base",
-      "props": {
-        "cmov": true,
-        "ia64": false,
-        "ssb-no": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "ibrs-all": false,
-        "pause-filter": false,
-        "xsavec": true,
-        "intel-pt": false,
-        "kvm-asyncpf": true,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "avx512cd": false,
-        "decodeassists": false,
-        "sse4.1": true,
-        "family": 6,
-        "wbnoinvd": false,
-        "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,
-        "avx512vbmi2": false,
-        "cr8legacy": false,
-        "stibp": false,
-        "xcrypt-en": false,
-        "pn": false,
-        "rsba": false,
-        "dca": false,
-        "vendor": "GenuineIntel",
-        "pku": false,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": true,
-        "3dnowext": false,
-        "amd-no-ssb": false,
-        "npt": false,
-        "rdctl-no": false,
-        "clwb": false,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": true,
-        "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": true,
-        "sse2": true,
-        "ssbd": true,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": true,
-        "kvm-pv-ipi": true,
-        "cx8": true,
-        "cldemote": false,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "avx512bitalg": false,
-        "pdcm": false,
-        "model": 94,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": false,
-        "invpcid": true,
-        "pdpe1gb": true,
-        "tsc-deadline": true,
-        "skip-l1dfl-vmentry": 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,
-        "spec-ctrl": true,
-        "tsc-adjust": true,
-        "kvm-steal-time": true,
-        "kvmclock": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "xop": false,
-        "ibpb": false,
-        "avx": true,
-        "movdiri": false,
-        "acpi": false,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": false,
-        "popcnt": true,
-        "vaes": false,
-        "movdir64b": false,
-        "xsaves": true,
-        "lm": true,
-        "umip": true,
-        "pse": true,
-        "avx2": true,
-        "sep": true,
-        "virt-ssbd": false,
-        "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,
-        "arch-capabilities": false,
-        "3dnow": false,
-        "erms": true,
-        "lahf-lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": true,
-        "kvm-hint-dedicated": false,
-        "lmce": true,
-        "perfctr-nb": false,
-        "rdrand": true,
-        "rdseed": true,
-        "avx512-4vnniw": false,
-        "vme": true,
-        "vmx": true,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": 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-51"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483656,
-        "cmov": true,
-        "ia64": false,
-        "ssb-no": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "ibrs-all": false,
-        "pause-filter": false,
-        "xsavec": true,
-        "intel-pt": false,
-        "hv-frequencies": false,
-        "tsc-frequency": 0,
-        "xd": true,
-        "x-intel-pt-auto-level": true,
-        "hv-vendor-id": "",
-        "kvm-asyncpf": true,
-        "kvm_asyncpf": true,
-        "perfctr_core": false,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "decodeassists": false,
-        "avx512cd": false,
-        "sse4_1": true,
-        "sse4.1": true,
-        "sse4-1": true,
-        "family": 6,
-        "legacy-cache": true,
-        "host-phys-bits-limit": 0,
-        "vmware-cpuid-freq": true,
-        "wbnoinvd": false,
-        "avx512f": false,
-        "msr": true,
-        "mce": true,
-        "mca": true,
-        "hv-runtime": false,
-        "xcrypt": false,
-        "thread-id": -1,
-        "min-level": 13,
-        "xgetbv1": true,
-        "cid": false,
-        "hv-relaxed": false,
-        "hv-crash": false,
-        "ds": false,
-        "fxsr": true,
-        "xsaveopt": true,
-        "xtpr": false,
-        "hv-evmcs": false,
-        "avx512vl": false,
-        "avx512-vpopcntdq": false,
-        "phe": false,
-        "extapic": false,
-        "3dnowprefetch": true,
-        "avx512vbmi2": false,
-        "cr8legacy": false,
-        "stibp": false,
-        "cpuid-0xb": true,
-        "xcrypt-en": false,
-        "kvm_pv_eoi": true,
-        "apic-id": 4294967295,
-        "rsba": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "GenuineIntel",
-        "hv-ipi": false,
-        "pku": false,
-        "smx": false,
-        "cmp_legacy": false,
-        "cmp-legacy": false,
-        "node-id": -1,
-        "avx512-4fmaps": false,
-        "vmcb_clean": false,
-        "vmcb-clean": false,
-        "3dnowext": false,
-        "amd-no-ssb": false,
-        "hle": true,
-        "npt": false,
-        "rdctl-no": false,
-        "memory": "/machine/unattached/system[0]",
-        "clwb": false,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm_lock": false,
-        "svm-lock": false,
-        "pfthreshold": false,
-        "smep": true,
-        "smap": true,
-        "x2apic": true,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "hv-stimer": false,
-        "x-hv-synic-kvm-only": 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,
-        "x-migrate-smi-count": true,
-        "svm": false,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
-        "invtsc": true,
-        "sse3": true,
-        "sse2": true,
-        "ssbd": true,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-ipi": true,
-        "kvm-pv-eoi": true,
-        "cx8": true,
-        "cldemote": false,
-        "hv-reenlightenment": false,
-        "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": 94,
-        "nrip_save": false,
-        "nrip-save": false,
-        "kvm_pv_unhalt": true,
-        "ssse3": true,
-        "sse4a": false,
-        "invpcid": true,
-        "pdpe1gb": true,
-        "tsc-deadline": true,
-        "skip-l1dfl-vmentry": true,
-        "fma": true,
-        "cx16": true,
-        "de": true,
-        "enforce": false,
-        "stepping": 3,
-        "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": true,
-        "min-xlevel2": 0,
-        "tsc-adjust": true,
-        "tsc_adjust": true,
-        "kvm-steal-time": true,
-        "kvm_steal_time": true,
-        "kvmclock": true,
-        "l3-cache": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "ibpb": false,
-        "xop": false,
-        "avx": true,
-        "movdiri": 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": true,
-        "movdir64b": false,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": true,
-        "pse": true,
-        "avx2": true,
-        "sep": true,
-        "pclmuldq": true,
-        "virt-ssbd": false,
-        "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": true,
-        "kvm-no-smi-migration": false,
-        "monitor": false,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": true,
-        "arch-capabilities": false,
-        "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": false,
-        "rtm": true,
-        "lmce": true,
-        "hv-time": false,
-        "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
-        "hv-tlbflush": false,
-        "rdrand": true,
-        "rdseed": true,
-        "avx512-4vnniw": false,
-        "vmx": true,
-        "vme": true,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": true,
-        "tbm": false,
-        "wdt": false,
-        "pause_filter": false,
-        "sha-ni": false,
-        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-51"
-}
-
-{
-  "execute": "qmp_capabilities",
-  "id": "libvirt-1"
-}
-
-{
-  "return": {
-  },
-  "id": "libvirt-1"
-}
-
-{
-  "execute": "query-cpu-definitions",
-  "id": "libvirt-2"
-}
-
-{
-  "return": [
-    {
-      "name": "max",
-      "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": false
-    },
-    {
-      "name": "host",
-      "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-        "kvm"
-      ],
-      "static": false,
-      "migration-safe": false
-    },
-    {
-      "name": "base",
-      "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": true,
-      "migration-safe": true
-    },
-    {
-      "name": "qemu64",
-      "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "qemu32",
-      "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "phenom",
-      "typename": "phenom-x86_64-cpu",
-      "unavailable-features": [
-        "fxsr-opt"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "pentium3",
-      "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "pentium2",
-      "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "pentium",
-      "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "n270",
-      "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "kvm64",
-      "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "kvm32",
-      "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "coreduo",
-      "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "core2duo",
-      "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "athlon",
-      "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Westmere-IBRS",
-      "typename": "Westmere-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Westmere",
-      "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Server-IBRS",
-      "typename": "Skylake-Server-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "avx512f",
-        "avx512dq",
-        "rdseed",
-        "avx512cd",
-        "avx512bw",
-        "avx512vl",
-        "spec-ctrl",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Server",
-      "typename": "Skylake-Server-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "avx512f",
-        "avx512dq",
-        "rdseed",
-        "avx512cd",
-        "avx512bw",
-        "avx512vl",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Client-IBRS",
-      "typename": "Skylake-Client-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "spec-ctrl",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Skylake-Client",
-      "typename": "Skylake-Client-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "SandyBridge-IBRS",
-      "typename": "SandyBridge-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "SandyBridge",
-      "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Penryn",
-      "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G5",
-      "typename": "Opteron_G5-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "avx",
-        "f16c",
-        "misalignsse",
-        "3dnowprefetch",
-        "xop",
-        "fma4",
-        "tbm",
-        "nrip-save"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G4",
-      "typename": "Opteron_G4-x86_64-cpu",
-      "unavailable-features": [
-        "avx",
-        "misalignsse",
-        "3dnowprefetch",
-        "xop",
-        "fma4",
-        "nrip-save"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G3",
-      "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-        "misalignsse"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G2",
-      "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Opteron_G1",
-      "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Nehalem-IBRS",
-      "typename": "Nehalem-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Nehalem",
-      "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "KnightsMill",
-      "typename": "KnightsMill-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "avx512f",
-        "rdseed",
-        "avx512pf",
-        "avx512er",
-        "avx512cd",
-        "avx512-vpopcntdq",
-        "avx512-4vnniw",
-        "avx512-4fmaps",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "IvyBridge-IBRS",
-      "typename": "IvyBridge-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "IvyBridge",
-      "typename": "IvyBridge-x86_64-cpu",
-      "unavailable-features": [
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Icelake-Server",
-      "typename": "Icelake-Server-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "avx512f",
-        "avx512dq",
-        "rdseed",
-        "avx512cd",
-        "avx512bw",
-        "avx512vl",
-        "avx512vbmi",
-        "umip",
-        "avx512vbmi2",
-        "gfni",
-        "vaes",
-        "vpclmulqdq",
-        "avx512vnni",
-        "avx512bitalg",
-        "avx512-vpopcntdq",
-        "spec-ctrl",
-        "ssbd",
-        "3dnowprefetch",
-        "wbnoinvd",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Icelake-Client",
-      "typename": "Icelake-Client-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "avx512vbmi",
-        "umip",
-        "avx512vbmi2",
-        "gfni",
-        "vaes",
-        "vpclmulqdq",
-        "avx512vnni",
-        "avx512bitalg",
-        "avx512-vpopcntdq",
-        "spec-ctrl",
-        "ssbd",
-        "3dnowprefetch",
-        "wbnoinvd",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell-noTSX-IBRS",
-      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid",
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell-noTSX",
-      "typename": "Haswell-noTSX-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell-IBRS",
-      "typename": "Haswell-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "spec-ctrl"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Haswell",
-      "typename": "Haswell-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "EPYC-IBPB",
-      "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "rdseed",
-        "sha-ni",
-        "fxsr-opt",
-        "misalignsse",
-        "3dnowprefetch",
-        "osvw",
-        "topoext",
-        "ibpb",
-        "nrip-save",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "EPYC",
-      "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "rdseed",
-        "sha-ni",
-        "fxsr-opt",
-        "misalignsse",
-        "3dnowprefetch",
-        "osvw",
-        "topoext",
-        "nrip-save",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Conroe",
-      "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Cascadelake-Server",
-      "typename": "Cascadelake-Server-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "avx512f",
-        "avx512dq",
-        "rdseed",
-        "avx512cd",
-        "avx512bw",
-        "avx512vl",
-        "avx512vnni",
-        "spec-ctrl",
-        "ssbd",
-        "3dnowprefetch",
-        "xsavec"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell-noTSX-IBRS",
-      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid",
-        "rdseed",
-        "spec-ctrl",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell-noTSX",
-      "typename": "Broadwell-noTSX-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "avx2",
-        "invpcid",
-        "rdseed",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell-IBRS",
-      "typename": "Broadwell-IBRS-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "spec-ctrl",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "Broadwell",
-      "typename": "Broadwell-x86_64-cpu",
-      "unavailable-features": [
-        "fma",
-        "pcid",
-        "x2apic",
-        "tsc-deadline",
-        "avx",
-        "f16c",
-        "rdrand",
-        "hle",
-        "avx2",
-        "invpcid",
-        "rtm",
-        "rdseed",
-        "3dnowprefetch"
-      ],
-      "static": false,
-      "migration-safe": true
-    },
-    {
-      "name": "486",
-      "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
-      "static": false,
-      "migration-safe": true
-    }
-  ],
-  "id": "libvirt-2"
-}
-
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "max"
-    }
-  },
-  "id": "libvirt-3"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "cmov": true,
-        "ia64": false,
-        "ssb-no": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "ibrs-all": false,
-        "pause-filter": false,
-        "xsavec": false,
-        "intel-pt": false,
-        "kvm-asyncpf": false,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "avx512cd": false,
-        "decodeassists": false,
-        "sse4.1": true,
-        "family": 6,
-        "wbnoinvd": false,
-        "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": false,
-        "avx512vbmi2": false,
-        "cr8legacy": true,
-        "stibp": false,
-        "xcrypt-en": false,
-        "pn": false,
-        "rsba": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "pku": true,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": false,
-        "3dnowext": true,
-        "amd-no-ssb": false,
-        "npt": true,
-        "rdctl-no": false,
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": true,
-        "pfthreshold": false,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pae": true,
-        "pat": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "pcommit": true,
-        "syscall": true,
-        "avx512dq": false,
-        "svm": true,
-        "invtsc": false,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": false,
-        "kvm-pv-ipi": false,
-        "cx8": true,
-        "cldemote": false,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "avx512bitalg": false,
-        "pdcm": false,
-        "model": 6,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "skip-l1dfl-vmentry": false,
-        "fma": false,
-        "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": true,
-        "osvw": false,
-        "apic": true,
-        "pmm": false,
-        "spec-ctrl": false,
-        "tsc-adjust": false,
-        "kvm-steal-time": false,
-        "kvmclock": false,
-        "lwp": false,
-        "amd-ssbd": false,
-        "xop": false,
-        "ibpb": false,
-        "avx": false,
-        "movdiri": false,
-        "acpi": true,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "popcnt": true,
-        "vaes": false,
-        "movdir64b": false,
-        "xsaves": false,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "virt-ssbd": false,
-        "nodeid-msr": false,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "bmi1": true,
-        "bmi2": true,
-        "kvm-pv-unhalt": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "clflushopt": true,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "arch-capabilities": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": false,
-        "kvm-hint-dedicated": false,
-        "lmce": false,
-        "perfctr-nb": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vme": false,
-        "vmx": false,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": false,
-        "tbm": false,
-        "wdt": false,
-        "model-id": "QEMU TCG CPU version 2.5+",
-        "sha-ni": false,
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-3"
-}
-
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "full",
-    "model": {
-      "name": "base",
-      "props": {
-        "cmov": true,
-        "ia64": false,
-        "ssb-no": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "ibrs-all": false,
-        "pause-filter": false,
-        "xsavec": false,
-        "intel-pt": false,
-        "kvm-asyncpf": false,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "avx512cd": false,
-        "decodeassists": false,
-        "sse4.1": true,
-        "family": 6,
-        "wbnoinvd": false,
-        "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": false,
-        "avx512vbmi2": false,
-        "cr8legacy": true,
-        "stibp": false,
-        "xcrypt-en": false,
-        "pn": false,
-        "rsba": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "pku": true,
-        "smx": false,
-        "cmp-legacy": false,
-        "avx512-4fmaps": false,
-        "vmcb-clean": false,
-        "hle": false,
-        "3dnowext": true,
-        "amd-no-ssb": false,
-        "npt": true,
-        "rdctl-no": false,
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm-lock": false,
-        "smep": true,
-        "smap": true,
-        "pfthreshold": false,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pae": true,
-        "pat": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "pcommit": true,
-        "syscall": true,
-        "avx512dq": false,
-        "svm": true,
-        "invtsc": false,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-eoi": false,
-        "kvm-pv-ipi": false,
-        "cx8": true,
-        "cldemote": false,
-        "kvm-mmu": false,
-        "sse4.2": true,
-        "pge": true,
-        "avx512bitalg": false,
-        "pdcm": false,
-        "model": 6,
-        "movbe": true,
-        "nrip-save": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "skip-l1dfl-vmentry": false,
-        "fma": false,
-        "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": true,
-        "osvw": false,
-        "apic": true,
-        "pmm": false,
-        "spec-ctrl": false,
-        "tsc-adjust": false,
-        "kvm-steal-time": false,
-        "kvmclock": false,
-        "lwp": false,
-        "amd-ssbd": false,
-        "xop": false,
-        "ibpb": false,
-        "avx": false,
-        "movdiri": false,
-        "acpi": true,
-        "avx512bw": false,
-        "ace2": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "popcnt": true,
-        "vaes": false,
-        "movdir64b": false,
-        "xsaves": false,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "virt-ssbd": false,
-        "nodeid-msr": false,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "bmi1": true,
-        "bmi2": true,
-        "kvm-pv-unhalt": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "clflushopt": true,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "arch-capabilities": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "xstore": false,
-        "rtm": false,
-        "kvm-hint-dedicated": false,
-        "lmce": false,
-        "perfctr-nb": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vme": false,
-        "vmx": false,
-        "dtes64": false,
-        "mtrr": true,
-        "rdtscp": true,
-        "pse36": true,
-        "kvm-pv-tlb-flush": false,
-        "tbm": false,
-        "wdt": false,
-        "model-id": "QEMU TCG CPU version 2.5+",
-        "sha-ni": false,
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-4"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483658,
-        "cmov": true,
-        "ia64": false,
-        "ssb-no": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "ibrs-all": false,
-        "pause-filter": false,
-        "xsavec": false,
-        "intel-pt": false,
-        "hv-frequencies": false,
-        "tsc-frequency": 0,
-        "xd": true,
-        "x-intel-pt-auto-level": true,
-        "hv-vendor-id": "",
-        "kvm-asyncpf": false,
-        "kvm_asyncpf": false,
-        "perfctr_core": false,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "decodeassists": false,
-        "avx512cd": false,
-        "sse4_1": true,
-        "sse4.1": true,
-        "sse4-1": true,
-        "family": 6,
-        "legacy-cache": true,
-        "host-phys-bits-limit": 0,
-        "vmware-cpuid-freq": true,
-        "wbnoinvd": false,
-        "avx512f": false,
-        "msr": true,
-        "mce": true,
-        "mca": true,
-        "hv-runtime": false,
-        "xcrypt": false,
-        "thread-id": -1,
-        "min-level": 13,
-        "xgetbv1": true,
-        "cid": false,
-        "hv-relaxed": false,
-        "hv-crash": false,
-        "ds": false,
-        "fxsr": true,
-        "xsaveopt": true,
-        "xtpr": false,
-        "hv-evmcs": false,
-        "avx512vl": false,
-        "avx512-vpopcntdq": false,
-        "phe": false,
-        "extapic": false,
-        "3dnowprefetch": false,
-        "avx512vbmi2": false,
-        "cr8legacy": true,
-        "stibp": false,
-        "cpuid-0xb": true,
-        "xcrypt-en": false,
-        "kvm_pv_eoi": false,
-        "apic-id": 4294967295,
-        "rsba": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "hv-ipi": false,
-        "pku": true,
-        "smx": false,
-        "cmp_legacy": false,
-        "cmp-legacy": false,
-        "node-id": -1,
-        "avx512-4fmaps": false,
-        "vmcb_clean": false,
-        "vmcb-clean": false,
-        "3dnowext": true,
-        "amd-no-ssb": false,
-        "hle": false,
-        "npt": true,
-        "rdctl-no": false,
-        "memory": "/machine/unattached/system[0]",
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm_lock": false,
-        "svm-lock": false,
-        "pfthreshold": false,
-        "smep": true,
-        "smap": true,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "hv-stimer": false,
-        "x-hv-synic-kvm-only": false,
-        "i64": true,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pat": true,
-        "pae": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm_nopiodelay": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "socket-id": -1,
-        "pcommit": true,
-        "syscall": true,
-        "level": 13,
-        "avx512dq": false,
-        "x-migrate-smi-count": true,
-        "svm": true,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
-        "invtsc": false,
-        "sse3": true,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-ipi": false,
-        "kvm-pv-eoi": false,
-        "cx8": true,
-        "cldemote": false,
-        "hv-reenlightenment": false,
-        "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": 6,
-        "nrip_save": false,
-        "nrip-save": false,
-        "kvm_pv_unhalt": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "skip-l1dfl-vmentry": false,
-        "fma": false,
-        "cx16": true,
-        "de": true,
-        "enforce": false,
-        "stepping": 3,
-        "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": true,
-        "osvw": false,
-        "check": true,
-        "hv-spinlocks": -1,
-        "pmu": false,
-        "pmm": false,
-        "apic": true,
-        "spec-ctrl": false,
-        "min-xlevel2": 0,
-        "tsc-adjust": false,
-        "tsc_adjust": false,
-        "kvm-steal-time": false,
-        "kvm_steal_time": false,
-        "kvmclock": false,
-        "l3-cache": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "ibpb": false,
-        "xop": false,
-        "avx": false,
-        "movdiri": false,
-        "ace2": false,
-        "avx512bw": false,
-        "acpi": true,
-        "hv-vapic": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "vaes": false,
-        "popcnt": true,
-        "xsaves": false,
-        "movdir64b": false,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "pclmuldq": true,
-        "virt-ssbd": false,
-        "x-hv-max-vps": -1,
-        "nodeid-msr": false,
-        "kvm": true,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "kvm-pv-unhalt": false,
-        "bmi2": true,
-        "bmi1": true,
-        "realized": false,
-        "tsc_scale": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "hv-vpindex": false,
-        "xlevel2": 0,
-        "clflushopt": true,
-        "kvm-no-smi-migration": false,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "arch-capabilities": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "lahf_lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "hv-synic": false,
-        "xstore": false,
-        "fxsr_opt": false,
-        "kvm-hint-dedicated": false,
-        "rtm": false,
-        "lmce": false,
-        "hv-time": false,
-        "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
-        "hv-tlbflush": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vmx": false,
-        "vme": false,
-        "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": "QEMU TCG CPU version 2.5+",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
+      "typename": "base-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "qemu64",
+      "typename": "qemu64-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "qemu32",
+      "typename": "qemu32-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "phenom",
+      "typename": "phenom-x86_64-cpu",
+      "unavailable-features": [
+        "fxsr-opt"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium3",
+      "typename": "pentium3-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium2",
+      "typename": "pentium2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium",
+      "typename": "pentium-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "n270",
+      "typename": "n270-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "kvm64",
+      "typename": "kvm64-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "kvm32",
+      "typename": "kvm32-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "coreduo",
+      "typename": "coreduo-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "core2duo",
+      "typename": "core2duo-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "athlon",
+      "typename": "athlon-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Westmere-IBRS",
+      "typename": "Westmere-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Westmere",
+      "typename": "Westmere-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Server-IBRS",
+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "spec-ctrl",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Server",
+      "typename": "Skylake-Server-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Client-IBRS",
+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "spec-ctrl",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Client",
+      "typename": "Skylake-Client-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "SandyBridge-IBRS",
+      "typename": "SandyBridge-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "SandyBridge",
+      "typename": "SandyBridge-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Penryn",
+      "typename": "Penryn-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G5",
+      "typename": "Opteron_G5-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "misalignsse",
+        "3dnowprefetch",
+        "xop",
+        "fma4",
+        "tbm",
+        "nrip-save"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G4",
+      "typename": "Opteron_G4-x86_64-cpu",
+      "unavailable-features": [
+        "avx",
+        "misalignsse",
+        "3dnowprefetch",
+        "xop",
+        "fma4",
+        "nrip-save"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G3",
+      "typename": "Opteron_G3-x86_64-cpu",
+      "unavailable-features": [
+        "misalignsse"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G2",
+      "typename": "Opteron_G2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G1",
+      "typename": "Opteron_G1-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Nehalem-IBRS",
+      "typename": "Nehalem-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Nehalem",
+      "typename": "Nehalem-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "KnightsMill",
+      "typename": "KnightsMill-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "avx512f",
+        "rdseed",
+        "avx512pf",
+        "avx512er",
+        "avx512cd",
+        "avx512-vpopcntdq",
+        "avx512-4vnniw",
+        "avx512-4fmaps",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "IvyBridge-IBRS",
+      "typename": "IvyBridge-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "IvyBridge",
+      "typename": "IvyBridge-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Icelake-Server",
+      "typename": "Icelake-Server-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "avx512vbmi",
+        "umip",
+        "avx512vbmi2",
+        "gfni",
+        "vaes",
+        "vpclmulqdq",
+        "avx512vnni",
+        "avx512bitalg",
+        "avx512-vpopcntdq",
+        "spec-ctrl",
+        "ssbd",
+        "3dnowprefetch",
+        "wbnoinvd",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Icelake-Client",
+      "typename": "Icelake-Client-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "avx512vbmi",
+        "umip",
+        "avx512vbmi2",
+        "gfni",
+        "vaes",
+        "vpclmulqdq",
+        "avx512vnni",
+        "avx512bitalg",
+        "avx512-vpopcntdq",
+        "spec-ctrl",
+        "ssbd",
+        "3dnowprefetch",
+        "wbnoinvd",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-noTSX-IBRS",
+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-noTSX",
+      "typename": "Haswell-noTSX-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-IBRS",
+      "typename": "Haswell-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell",
+      "typename": "Haswell-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "EPYC-IBPB",
+      "typename": "EPYC-IBPB-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "rdseed",
+        "sha-ni",
+        "fxsr-opt",
+        "misalignsse",
+        "3dnowprefetch",
+        "osvw",
+        "topoext",
+        "ibpb",
+        "nrip-save",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "EPYC",
+      "typename": "EPYC-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "rdseed",
+        "sha-ni",
+        "fxsr-opt",
+        "misalignsse",
+        "3dnowprefetch",
+        "osvw",
+        "topoext",
+        "nrip-save",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Conroe",
+      "typename": "Conroe-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Cascadelake-Server",
+      "typename": "Cascadelake-Server-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "avx512vnni",
+        "spec-ctrl",
+        "ssbd",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-noTSX-IBRS",
+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid",
+        "rdseed",
+        "spec-ctrl",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-noTSX",
+      "typename": "Broadwell-noTSX-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "avx2",
+        "invpcid",
+        "rdseed",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-IBRS",
+      "typename": "Broadwell-IBRS-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "spec-ctrl",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell",
+      "typename": "Broadwell-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "rdrand",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "486",
+      "typename": "486-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
     }
-  },
-  "id": "libvirt-4"
+  ],
+  "id": "libvirt-2"
 }
 
 {
@@ -24088,13 +22418,10 @@
   "arguments": {
     "type": "static",
     "model": {
-      "name": "max",
-      "props": {
-        "migratable": false
-      }
+      "name": "max"
     }
   },
-  "id": "libvirt-5"
+  "id": "libvirt-3"
 }
 
 {
@@ -24298,13 +22625,25 @@
       }
     }
   },
-  "id": "libvirt-5"
+  "id": "libvirt-3"
 }
 
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
-    "type": "full",
+    "type": "static",
+    "model": {
+      "name": "max",
+      "props": {
+        "migratable": false
+      }
+    }
+  },
+  "id": "libvirt-4"
+}
+
+{
+  "return": {
     "model": {
       "name": "base",
       "props": {
@@ -24504,291 +22843,12 @@
       }
     }
   },
-  "id": "libvirt-6"
-}
-
-{
-  "return": {
-    "model": {
-      "name": "base",
-      "props": {
-        "phys-bits": 0,
-        "core-id": -1,
-        "xlevel": 2147483658,
-        "cmov": true,
-        "ia64": false,
-        "ssb-no": false,
-        "aes": true,
-        "mmx": true,
-        "rdpid": false,
-        "arat": true,
-        "gfni": false,
-        "ibrs-all": false,
-        "pause-filter": false,
-        "xsavec": false,
-        "intel-pt": false,
-        "hv-frequencies": false,
-        "tsc-frequency": 0,
-        "xd": true,
-        "x-intel-pt-auto-level": true,
-        "hv-vendor-id": "",
-        "kvm-asyncpf": false,
-        "kvm_asyncpf": false,
-        "perfctr_core": false,
-        "perfctr-core": false,
-        "mpx": true,
-        "pbe": false,
-        "decodeassists": false,
-        "avx512cd": false,
-        "sse4_1": true,
-        "sse4.1": true,
-        "sse4-1": true,
-        "family": 6,
-        "legacy-cache": true,
-        "host-phys-bits-limit": 0,
-        "vmware-cpuid-freq": true,
-        "wbnoinvd": false,
-        "avx512f": false,
-        "msr": true,
-        "mce": true,
-        "mca": true,
-        "hv-runtime": false,
-        "xcrypt": false,
-        "thread-id": -1,
-        "min-level": 13,
-        "xgetbv1": true,
-        "cid": false,
-        "hv-relaxed": false,
-        "hv-crash": false,
-        "ds": false,
-        "fxsr": true,
-        "xsaveopt": true,
-        "xtpr": false,
-        "hv-evmcs": false,
-        "avx512vl": false,
-        "avx512-vpopcntdq": false,
-        "phe": false,
-        "extapic": false,
-        "3dnowprefetch": false,
-        "avx512vbmi2": false,
-        "cr8legacy": true,
-        "stibp": false,
-        "cpuid-0xb": true,
-        "xcrypt-en": false,
-        "kvm_pv_eoi": false,
-        "apic-id": 4294967295,
-        "rsba": false,
-        "pn": false,
-        "dca": false,
-        "vendor": "AuthenticAMD",
-        "hv-ipi": false,
-        "pku": true,
-        "smx": false,
-        "cmp_legacy": false,
-        "cmp-legacy": false,
-        "node-id": -1,
-        "avx512-4fmaps": false,
-        "vmcb_clean": false,
-        "vmcb-clean": false,
-        "3dnowext": true,
-        "amd-no-ssb": false,
-        "hle": false,
-        "npt": true,
-        "rdctl-no": false,
-        "memory": "/machine/unattached/system[0]",
-        "clwb": true,
-        "lbrv": false,
-        "adx": true,
-        "ss": true,
-        "pni": true,
-        "svm_lock": false,
-        "svm-lock": false,
-        "pfthreshold": false,
-        "smep": true,
-        "smap": true,
-        "x2apic": false,
-        "avx512vbmi": false,
-        "avx512vnni": false,
-        "hv-stimer": false,
-        "x-hv-synic-kvm-only": false,
-        "i64": true,
-        "flushbyasid": false,
-        "f16c": false,
-        "ace2-en": false,
-        "pat": true,
-        "pae": true,
-        "sse": true,
-        "phe-en": false,
-        "kvm_nopiodelay": false,
-        "kvm-nopiodelay": false,
-        "tm": false,
-        "kvmclock-stable-bit": false,
-        "hypervisor": true,
-        "socket-id": -1,
-        "pcommit": true,
-        "syscall": true,
-        "level": 13,
-        "avx512dq": false,
-        "x-migrate-smi-count": true,
-        "svm": true,
-        "full-cpuid-auto-level": true,
-        "hv-reset": false,
-        "invtsc": false,
-        "sse3": true,
-        "sse2": true,
-        "ssbd": false,
-        "est": false,
-        "avx512ifma": false,
-        "tm2": false,
-        "kvm-pv-ipi": false,
-        "kvm-pv-eoi": false,
-        "cx8": true,
-        "cldemote": false,
-        "hv-reenlightenment": false,
-        "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": 6,
-        "nrip_save": false,
-        "nrip-save": false,
-        "kvm_pv_unhalt": false,
-        "ssse3": true,
-        "sse4a": true,
-        "invpcid": false,
-        "pdpe1gb": true,
-        "tsc-deadline": false,
-        "skip-l1dfl-vmentry": false,
-        "fma": false,
-        "cx16": true,
-        "de": true,
-        "enforce": false,
-        "stepping": 3,
-        "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": true,
-        "osvw": false,
-        "check": true,
-        "hv-spinlocks": -1,
-        "pmu": false,
-        "pmm": false,
-        "apic": true,
-        "spec-ctrl": false,
-        "min-xlevel2": 0,
-        "tsc-adjust": false,
-        "tsc_adjust": false,
-        "kvm-steal-time": false,
-        "kvm_steal_time": false,
-        "kvmclock": false,
-        "l3-cache": true,
-        "lwp": false,
-        "amd-ssbd": false,
-        "ibpb": false,
-        "xop": false,
-        "avx": false,
-        "movdiri": false,
-        "ace2": false,
-        "avx512bw": false,
-        "acpi": true,
-        "hv-vapic": false,
-        "fsgsbase": true,
-        "ht": false,
-        "nx": true,
-        "pclmulqdq": true,
-        "mmxext": true,
-        "vaes": false,
-        "popcnt": true,
-        "xsaves": false,
-        "movdir64b": false,
-        "tcg-cpuid": true,
-        "lm": true,
-        "umip": false,
-        "pse": true,
-        "avx2": false,
-        "sep": true,
-        "pclmuldq": true,
-        "virt-ssbd": false,
-        "x-hv-max-vps": -1,
-        "nodeid-msr": false,
-        "kvm": true,
-        "misalignsse": false,
-        "min-xlevel": 2147483658,
-        "kvm-pv-unhalt": false,
-        "bmi2": true,
-        "bmi1": true,
-        "realized": false,
-        "tsc_scale": false,
-        "tsc-scale": false,
-        "topoext": false,
-        "hv-vpindex": false,
-        "xlevel2": 0,
-        "clflushopt": true,
-        "kvm-no-smi-migration": false,
-        "monitor": true,
-        "avx512er": false,
-        "pmm-en": false,
-        "pcid": false,
-        "arch-capabilities": false,
-        "3dnow": true,
-        "erms": true,
-        "lahf-lm": true,
-        "lahf_lm": true,
-        "vpclmulqdq": false,
-        "fxsr-opt": false,
-        "hv-synic": false,
-        "xstore": false,
-        "fxsr_opt": false,
-        "kvm-hint-dedicated": false,
-        "rtm": false,
-        "lmce": false,
-        "hv-time": false,
-        "perfctr-nb": false,
-        "perfctr_nb": false,
-        "ffxsr": false,
-        "hv-tlbflush": false,
-        "rdrand": false,
-        "rdseed": false,
-        "avx512-4vnniw": false,
-        "vmx": false,
-        "vme": false,
-        "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": "QEMU TCG CPU version 2.5+",
-        "abm": true,
-        "avx512pf": false,
-        "xstore-en": false
-      }
-    }
-  },
-  "id": "libvirt-6"
+  "id": "libvirt-4"
 }
 
 {
   "execute": "query-machines",
-  "id": "libvirt-7"
+  "id": "libvirt-5"
 }
 
 {
@@ -25007,5 +23067,5 @@
       "alias": "q35"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-5"
 }
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 5e733fec13..02a1aa03ae 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -208,9 +208,6 @@
   <package>v4.0.0</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
-    <property name='phys-bits' type='number' value='0'/>
-    <property name='core-id' type='number' value='-1'/>
-    <property name='xlevel' type='number' value='2147483656'/>
     <property name='cmov' type='boolean' value='true' migratable='yes'/>
     <property name='ia64' type='boolean' value='false'/>
     <property name='ssb-no' type='boolean' value='false'/>
@@ -223,44 +220,27 @@
     <property name='pause-filter' type='boolean' value='false'/>
     <property name='xsavec' type='boolean' value='true' migratable='yes'/>
     <property name='intel-pt' type='boolean' value='false'/>
-    <property name='hv-frequencies' type='boolean' value='false'/>
-    <property name='tsc-frequency' type='number' value='0'/>
-    <property name='xd' type='boolean' value='true' migratable='yes'/>
-    <property name='x-intel-pt-auto-level' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-vendor-id' type='string' value=''/>
     <property name='kvm-asyncpf' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm_asyncpf' type='boolean' value='true' migratable='yes'/>
-    <property name='perfctr_core' type='boolean' value='false'/>
     <property name='perfctr-core' type='boolean' value='false'/>
     <property name='mpx' type='boolean' value='true' migratable='yes'/>
     <property name='pbe' type='boolean' value='false'/>
-    <property name='decodeassists' type='boolean' value='false'/>
     <property name='avx512cd' type='boolean' value='false'/>
-    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
+    <property name='decodeassists' type='boolean' value='false'/>
     <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
     <property name='family' type='number' value='6'/>
-    <property name='legacy-cache' type='boolean' value='true' migratable='yes'/>
-    <property name='host-phys-bits-limit' type='number' value='0'/>
-    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
     <property name='wbnoinvd' type='boolean' value='false'/>
     <property name='avx512f' type='boolean' value='false'/>
     <property name='msr' type='boolean' value='true' migratable='yes'/>
     <property name='mce' type='boolean' value='true' migratable='yes'/>
     <property name='mca' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-runtime' type='boolean' value='false'/>
     <property name='xcrypt' type='boolean' value='false'/>
-    <property name='thread-id' type='number' value='-1'/>
     <property name='min-level' type='number' value='13'/>
     <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
     <property name='cid' type='boolean' value='false'/>
-    <property name='hv-relaxed' type='boolean' value='false'/>
-    <property name='hv-crash' type='boolean' value='false'/>
     <property name='ds' type='boolean' value='false'/>
     <property name='fxsr' type='boolean' value='true' migratable='yes'/>
     <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
     <property name='xtpr' type='boolean' value='false'/>
-    <property name='hv-evmcs' type='boolean' value='false'/>
     <property name='avx512vl' type='boolean' value='false'/>
     <property name='avx512-vpopcntdq' type='boolean' value='false'/>
     <property name='phe' type='boolean' value='false'/>
@@ -269,93 +249,66 @@
     <property name='avx512vbmi2' type='boolean' value='false'/>
     <property name='cr8legacy' type='boolean' value='false'/>
     <property name='stibp' type='boolean' value='false'/>
-    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
     <property name='xcrypt-en' type='boolean' value='false'/>
-    <property name='kvm_pv_eoi' type='boolean' value='true' migratable='yes'/>
-    <property name='apic-id' type='number' value='4294967295'/>
-    <property name='rsba' type='boolean' value='false'/>
     <property name='pn' type='boolean' value='false'/>
+    <property name='rsba' type='boolean' value='false'/>
     <property name='dca' type='boolean' value='false'/>
     <property name='vendor' type='string' value='GenuineIntel'/>
-    <property name='hv-ipi' type='boolean' value='false'/>
     <property name='pku' type='boolean' value='false'/>
     <property name='smx' type='boolean' value='false'/>
-    <property name='cmp_legacy' type='boolean' value='false'/>
     <property name='cmp-legacy' type='boolean' value='false'/>
-    <property name='node-id' type='number' value='-1'/>
     <property name='avx512-4fmaps' type='boolean' value='false'/>
-    <property name='vmcb_clean' type='boolean' value='false'/>
     <property name='vmcb-clean' type='boolean' value='false'/>
+    <property name='hle' type='boolean' value='true' migratable='yes'/>
     <property name='3dnowext' type='boolean' value='false'/>
     <property name='amd-no-ssb' type='boolean' value='false'/>
-    <property name='hle' type='boolean' value='true' migratable='yes'/>
     <property name='npt' type='boolean' value='false'/>
     <property name='rdctl-no' type='boolean' value='false'/>
-    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
     <property name='clwb' type='boolean' value='false'/>
     <property name='lbrv' type='boolean' value='false'/>
     <property name='adx' type='boolean' value='true' migratable='yes'/>
     <property name='ss' type='boolean' value='true' migratable='yes'/>
     <property name='pni' type='boolean' value='true' migratable='yes'/>
-    <property name='svm_lock' type='boolean' value='false'/>
     <property name='svm-lock' type='boolean' value='false'/>
-    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='smep' type='boolean' value='true' migratable='yes'/>
     <property name='smap' type='boolean' value='true' migratable='yes'/>
+    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='x2apic' type='boolean' value='true' migratable='yes'/>
     <property name='avx512vbmi' type='boolean' value='false'/>
     <property name='avx512vnni' type='boolean' value='false'/>
-    <property name='hv-stimer' type='boolean' value='false'/>
-    <property name='x-hv-synic-kvm-only' type='boolean' value='false'/>
-    <property name='i64' type='boolean' value='true' migratable='yes'/>
     <property name='flushbyasid' type='boolean' value='false'/>
     <property name='f16c' type='boolean' value='true' migratable='yes'/>
     <property name='ace2-en' type='boolean' value='false'/>
-    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='pae' type='boolean' value='true' migratable='yes'/>
+    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='sse' type='boolean' value='true' migratable='yes'/>
     <property name='phe-en' type='boolean' value='false'/>
-    <property name='kvm_nopiodelay' type='boolean' value='true' migratable='yes'/>
     <property name='kvm-nopiodelay' type='boolean' value='true' migratable='yes'/>
     <property name='tm' type='boolean' value='false'/>
     <property name='kvmclock-stable-bit' type='boolean' value='true' migratable='yes'/>
     <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-    <property name='socket-id' type='number' value='-1'/>
     <property name='pcommit' type='boolean' value='false'/>
     <property name='syscall' type='boolean' value='true' migratable='yes'/>
-    <property name='level' type='number' value='13'/>
     <property name='avx512dq' type='boolean' value='false'/>
-    <property name='x-migrate-smi-count' type='boolean' value='true' migratable='yes'/>
     <property name='svm' type='boolean' value='false'/>
-    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-reset' type='boolean' value='false'/>
     <property name='invtsc' type='boolean' value='true' migratable='no'/>
-    <property name='sse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse2' type='boolean' value='true' migratable='yes'/>
     <property name='ssbd' type='boolean' value='true' migratable='yes'/>
     <property name='est' type='boolean' value='false'/>
     <property name='avx512ifma' type='boolean' value='false'/>
     <property name='tm2' type='boolean' value='false'/>
-    <property name='kvm-pv-ipi' type='boolean' value='true' migratable='yes'/>
     <property name='kvm-pv-eoi' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-pv-ipi' type='boolean' value='true' migratable='yes'/>
     <property name='cx8' type='boolean' value='true' migratable='yes'/>
     <property name='cldemote' type='boolean' value='false'/>
-    <property name='hv-reenlightenment' type='boolean' value='false'/>
-    <property name='kvm_mmu' type='boolean' value='false'/>
     <property name='kvm-mmu' type='boolean' value='false'/>
-    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
     <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
     <property name='pge' type='boolean' value='true' migratable='yes'/>
-    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
     <property name='avx512bitalg' type='boolean' value='false'/>
-    <property name='nodeid_msr' type='boolean' value='false'/>
     <property name='pdcm' type='boolean' value='false'/>
-    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='model' type='number' value='94'/>
-    <property name='nrip_save' type='boolean' value='false'/>
+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='nrip-save' type='boolean' value='false'/>
-    <property name='kvm_pv_unhalt' type='boolean' value='true' migratable='yes'/>
     <property name='ssse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse4a' type='boolean' value='false'/>
     <property name='invpcid' type='boolean' value='true' migratable='yes'/>
@@ -365,7 +318,6 @@
     <property name='fma' type='boolean' value='true' migratable='yes'/>
     <property name='cx16' type='boolean' value='true' migratable='yes'/>
     <property name='de' type='boolean' value='true' migratable='yes'/>
-    <property name='enforce' type='boolean' value='false'/>
     <property name='stepping' type='number' value='3'/>
     <property name='xsave' type='boolean' value='true' migratable='yes'/>
     <property name='clflush' type='boolean' value='true' migratable='yes'/>
@@ -373,69 +325,50 @@
     <property name='tsc' type='boolean' value='true' migratable='yes'/>
     <property name='tce' type='boolean' value='false'/>
     <property name='fpu' type='boolean' value='true' migratable='yes'/>
-    <property name='ibs' type='boolean' value='false'/>
-    <property name='ds_cpl' type='boolean' value='false'/>
     <property name='ds-cpl' type='boolean' value='false'/>
-    <property name='host-phys-bits' type='boolean' value='false'/>
+    <property name='ibs' type='boolean' value='false'/>
     <property name='fma4' type='boolean' value='false'/>
     <property name='la57' type='boolean' value='false'/>
     <property name='osvw' type='boolean' value='false'/>
-    <property name='check' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-spinlocks' type='number' value='-1'/>
-    <property name='pmu' type='boolean' value='false'/>
-    <property name='pmm' type='boolean' value='false'/>
     <property name='apic' type='boolean' value='true' migratable='yes'/>
+    <property name='pmm' type='boolean' value='false'/>
     <property name='spec-ctrl' type='boolean' value='true' migratable='yes'/>
-    <property name='min-xlevel2' type='number' value='0'/>
     <property name='tsc-adjust' type='boolean' value='true' migratable='yes'/>
-    <property name='tsc_adjust' type='boolean' value='true' migratable='yes'/>
     <property name='kvm-steal-time' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm_steal_time' type='boolean' value='true' migratable='yes'/>
     <property name='kvmclock' type='boolean' value='true' migratable='yes'/>
-    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
     <property name='lwp' type='boolean' value='false'/>
     <property name='amd-ssbd' type='boolean' value='false'/>
-    <property name='ibpb' type='boolean' value='false'/>
     <property name='xop' type='boolean' value='false'/>
+    <property name='ibpb' type='boolean' value='false'/>
     <property name='avx' type='boolean' value='true' migratable='yes'/>
     <property name='movdiri' type='boolean' value='false'/>
-    <property name='ace2' type='boolean' value='false'/>
-    <property name='avx512bw' type='boolean' value='false'/>
     <property name='acpi' type='boolean' value='false'/>
-    <property name='hv-vapic' type='boolean' value='false'/>
+    <property name='avx512bw' type='boolean' value='false'/>
+    <property name='ace2' type='boolean' value='false'/>
     <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
     <property name='ht' type='boolean' value='false'/>
     <property name='nx' type='boolean' value='true' migratable='yes'/>
     <property name='pclmulqdq' type='boolean' value='true' migratable='yes'/>
     <property name='mmxext' type='boolean' value='false'/>
-    <property name='vaes' type='boolean' value='false'/>
     <property name='popcnt' type='boolean' value='true' migratable='yes'/>
-    <property name='xsaves' type='boolean' value='true' migratable='yes'/>
+    <property name='vaes' type='boolean' value='false'/>
     <property name='movdir64b' type='boolean' value='false'/>
-    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
+    <property name='xsaves' type='boolean' value='true' migratable='yes'/>
     <property name='lm' type='boolean' value='true' migratable='yes'/>
     <property name='umip' type='boolean' value='true' migratable='yes'/>
     <property name='pse' type='boolean' value='true' migratable='yes'/>
     <property name='avx2' type='boolean' value='true' migratable='yes'/>
     <property name='sep' type='boolean' value='true' migratable='yes'/>
-    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
     <property name='virt-ssbd' type='boolean' value='false'/>
-    <property name='x-hv-max-vps' type='number' value='-1'/>
     <property name='nodeid-msr' type='boolean' value='false'/>
-    <property name='kvm' type='boolean' value='true' migratable='yes'/>
     <property name='misalignsse' type='boolean' value='false'/>
     <property name='min-xlevel' type='number' value='2147483656'/>
-    <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/>
-    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
     <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-    <property name='realized' type='boolean' value='false'/>
-    <property name='tsc_scale' type='boolean' value='false'/>
+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/>
     <property name='tsc-scale' type='boolean' value='false'/>
     <property name='topoext' type='boolean' value='false'/>
-    <property name='hv-vpindex' type='boolean' value='false'/>
-    <property name='xlevel2' type='number' value='0'/>
     <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
     <property name='monitor' type='boolean' value='false'/>
     <property name='avx512er' type='boolean' value='false'/>
     <property name='pmm-en' type='boolean' value='false'/>
@@ -444,25 +377,18 @@
     <property name='3dnow' type='boolean' value='false'/>
     <property name='erms' type='boolean' value='true' migratable='yes'/>
     <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
     <property name='vpclmulqdq' type='boolean' value='false'/>
     <property name='fxsr-opt' type='boolean' value='false'/>
-    <property name='hv-synic' type='boolean' value='false'/>
     <property name='xstore' type='boolean' value='false'/>
-    <property name='fxsr_opt' type='boolean' value='false'/>
-    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
     <property name='rtm' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
     <property name='lmce' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-time' type='boolean' value='false'/>
     <property name='perfctr-nb' type='boolean' value='false'/>
-    <property name='perfctr_nb' type='boolean' value='false'/>
-    <property name='ffxsr' type='boolean' value='false'/>
-    <property name='hv-tlbflush' type='boolean' value='false'/>
     <property name='rdrand' type='boolean' value='true' migratable='yes'/>
     <property name='rdseed' type='boolean' value='true' migratable='yes'/>
     <property name='avx512-4vnniw' type='boolean' value='false'/>
-    <property name='vmx' type='boolean' value='true' migratable='yes'/>
     <property name='vme' type='boolean' value='true' migratable='yes'/>
+    <property name='vmx' type='boolean' value='true' migratable='yes'/>
     <property name='dtes64' type='boolean' value='false'/>
     <property name='mtrr' type='boolean' value='true' migratable='yes'/>
     <property name='rdtscp' type='boolean' value='true' migratable='yes'/>
@@ -470,9 +396,8 @@
     <property name='kvm-pv-tlb-flush' type='boolean' value='true' migratable='yes'/>
     <property name='tbm' type='boolean' value='false'/>
     <property name='wdt' type='boolean' value='false'/>
-    <property name='pause_filter' type='boolean' value='false'/>
-    <property name='sha-ni' type='boolean' value='false'/>
     <property name='model-id' type='string' value='Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz'/>
+    <property name='sha-ni' type='boolean' value='false'/>
     <property name='abm' type='boolean' value='true' migratable='yes'/>
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
@@ -700,9 +625,6 @@
   <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
   <machine type='kvm' name='pc-q35-4.0' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
   <hostCPU type='tcg' model='base' migratability='yes'>
-    <property name='phys-bits' type='number' value='0'/>
-    <property name='core-id' type='number' value='-1'/>
-    <property name='xlevel' type='number' value='2147483658'/>
     <property name='cmov' type='boolean' value='true' migratable='yes'/>
     <property name='ia64' type='boolean' value='false'/>
     <property name='ssb-no' type='boolean' value='false'/>
@@ -715,44 +637,27 @@
     <property name='pause-filter' type='boolean' value='false'/>
     <property name='xsavec' type='boolean' value='false'/>
     <property name='intel-pt' type='boolean' value='false'/>
-    <property name='hv-frequencies' type='boolean' value='false'/>
-    <property name='tsc-frequency' type='number' value='0'/>
-    <property name='xd' type='boolean' value='true' migratable='yes'/>
-    <property name='x-intel-pt-auto-level' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-vendor-id' type='string' value=''/>
     <property name='kvm-asyncpf' type='boolean' value='false'/>
-    <property name='kvm_asyncpf' type='boolean' value='false'/>
-    <property name='perfctr_core' type='boolean' value='false'/>
     <property name='perfctr-core' type='boolean' value='false'/>
     <property name='mpx' type='boolean' value='true' migratable='yes'/>
     <property name='pbe' type='boolean' value='false'/>
-    <property name='decodeassists' type='boolean' value='false'/>
     <property name='avx512cd' type='boolean' value='false'/>
-    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
+    <property name='decodeassists' type='boolean' value='false'/>
     <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
     <property name='family' type='number' value='6'/>
-    <property name='legacy-cache' type='boolean' value='true' migratable='yes'/>
-    <property name='host-phys-bits-limit' type='number' value='0'/>
-    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
     <property name='wbnoinvd' type='boolean' value='false'/>
     <property name='avx512f' type='boolean' value='false'/>
     <property name='msr' type='boolean' value='true' migratable='yes'/>
     <property name='mce' type='boolean' value='true' migratable='yes'/>
     <property name='mca' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-runtime' type='boolean' value='false'/>
     <property name='xcrypt' type='boolean' value='false'/>
-    <property name='thread-id' type='number' value='-1'/>
     <property name='min-level' type='number' value='13'/>
     <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
     <property name='cid' type='boolean' value='false'/>
-    <property name='hv-relaxed' type='boolean' value='false'/>
-    <property name='hv-crash' type='boolean' value='false'/>
     <property name='ds' type='boolean' value='false'/>
     <property name='fxsr' type='boolean' value='true' migratable='yes'/>
     <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
     <property name='xtpr' type='boolean' value='false'/>
-    <property name='hv-evmcs' type='boolean' value='false'/>
     <property name='avx512vl' type='boolean' value='false'/>
     <property name='avx512-vpopcntdq' type='boolean' value='false'/>
     <property name='phe' type='boolean' value='false'/>
@@ -761,93 +666,66 @@
     <property name='avx512vbmi2' type='boolean' value='false'/>
     <property name='cr8legacy' type='boolean' value='true' migratable='yes'/>
     <property name='stibp' type='boolean' value='false'/>
-    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
     <property name='xcrypt-en' type='boolean' value='false'/>
-    <property name='kvm_pv_eoi' type='boolean' value='false'/>
-    <property name='apic-id' type='number' value='4294967295'/>
-    <property name='rsba' type='boolean' value='false'/>
     <property name='pn' type='boolean' value='false'/>
+    <property name='rsba' type='boolean' value='false'/>
     <property name='dca' type='boolean' value='false'/>
     <property name='vendor' type='string' value='AuthenticAMD'/>
-    <property name='hv-ipi' type='boolean' value='false'/>
     <property name='pku' type='boolean' value='true' migratable='yes'/>
     <property name='smx' type='boolean' value='false'/>
-    <property name='cmp_legacy' type='boolean' value='false'/>
     <property name='cmp-legacy' type='boolean' value='false'/>
-    <property name='node-id' type='number' value='-1'/>
     <property name='avx512-4fmaps' type='boolean' value='false'/>
-    <property name='vmcb_clean' type='boolean' value='false'/>
     <property name='vmcb-clean' type='boolean' value='false'/>
+    <property name='hle' type='boolean' value='false'/>
     <property name='3dnowext' type='boolean' value='true' migratable='yes'/>
     <property name='amd-no-ssb' type='boolean' value='false'/>
-    <property name='hle' type='boolean' value='false'/>
     <property name='npt' type='boolean' value='true' migratable='yes'/>
     <property name='rdctl-no' type='boolean' value='false'/>
-    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
     <property name='clwb' type='boolean' value='true' migratable='yes'/>
     <property name='lbrv' type='boolean' value='false'/>
     <property name='adx' type='boolean' value='true' migratable='yes'/>
     <property name='ss' type='boolean' value='true' migratable='yes'/>
     <property name='pni' type='boolean' value='true' migratable='yes'/>
-    <property name='svm_lock' type='boolean' value='false'/>
     <property name='svm-lock' type='boolean' value='false'/>
-    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='smep' type='boolean' value='true' migratable='yes'/>
     <property name='smap' type='boolean' value='true' migratable='yes'/>
+    <property name='pfthreshold' type='boolean' value='false'/>
     <property name='x2apic' type='boolean' value='false'/>
     <property name='avx512vbmi' type='boolean' value='false'/>
     <property name='avx512vnni' type='boolean' value='false'/>
-    <property name='hv-stimer' type='boolean' value='false'/>
-    <property name='x-hv-synic-kvm-only' type='boolean' value='false'/>
-    <property name='i64' type='boolean' value='true' migratable='yes'/>
     <property name='flushbyasid' type='boolean' value='false'/>
     <property name='f16c' type='boolean' value='false'/>
     <property name='ace2-en' type='boolean' value='false'/>
-    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='pae' type='boolean' value='true' migratable='yes'/>
+    <property name='pat' type='boolean' value='true' migratable='yes'/>
     <property name='sse' type='boolean' value='true' migratable='yes'/>
     <property name='phe-en' type='boolean' value='false'/>
-    <property name='kvm_nopiodelay' type='boolean' value='false'/>
     <property name='kvm-nopiodelay' type='boolean' value='false'/>
     <property name='tm' type='boolean' value='false'/>
     <property name='kvmclock-stable-bit' type='boolean' value='false'/>
     <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-    <property name='socket-id' type='number' value='-1'/>
     <property name='pcommit' type='boolean' value='true' migratable='yes'/>
     <property name='syscall' type='boolean' value='true' migratable='yes'/>
-    <property name='level' type='number' value='13'/>
     <property name='avx512dq' type='boolean' value='false'/>
-    <property name='x-migrate-smi-count' type='boolean' value='true' migratable='yes'/>
     <property name='svm' type='boolean' value='true' migratable='yes'/>
-    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-reset' type='boolean' value='false'/>
     <property name='invtsc' type='boolean' value='false'/>
-    <property name='sse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse2' type='boolean' value='true' migratable='yes'/>
     <property name='ssbd' type='boolean' value='false'/>
     <property name='est' type='boolean' value='false'/>
     <property name='avx512ifma' type='boolean' value='false'/>
     <property name='tm2' type='boolean' value='false'/>
-    <property name='kvm-pv-ipi' type='boolean' value='false'/>
     <property name='kvm-pv-eoi' type='boolean' value='false'/>
+    <property name='kvm-pv-ipi' type='boolean' value='false'/>
     <property name='cx8' type='boolean' value='true' migratable='yes'/>
     <property name='cldemote' type='boolean' value='false'/>
-    <property name='hv-reenlightenment' type='boolean' value='false'/>
-    <property name='kvm_mmu' type='boolean' value='false'/>
     <property name='kvm-mmu' type='boolean' value='false'/>
-    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
     <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
     <property name='pge' type='boolean' value='true' migratable='yes'/>
-    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
     <property name='avx512bitalg' type='boolean' value='false'/>
-    <property name='nodeid_msr' type='boolean' value='false'/>
     <property name='pdcm' type='boolean' value='false'/>
-    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='model' type='number' value='6'/>
-    <property name='nrip_save' type='boolean' value='false'/>
+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
     <property name='nrip-save' type='boolean' value='false'/>
-    <property name='kvm_pv_unhalt' type='boolean' value='false'/>
     <property name='ssse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse4a' type='boolean' value='true' migratable='yes'/>
     <property name='invpcid' type='boolean' value='false'/>
@@ -857,7 +735,6 @@
     <property name='fma' type='boolean' value='false'/>
     <property name='cx16' type='boolean' value='true' migratable='yes'/>
     <property name='de' type='boolean' value='true' migratable='yes'/>
-    <property name='enforce' type='boolean' value='false'/>
     <property name='stepping' type='number' value='3'/>
     <property name='xsave' type='boolean' value='true' migratable='yes'/>
     <property name='clflush' type='boolean' value='true' migratable='yes'/>
@@ -865,69 +742,50 @@
     <property name='tsc' type='boolean' value='true' migratable='yes'/>
     <property name='tce' type='boolean' value='false'/>
     <property name='fpu' type='boolean' value='true' migratable='yes'/>
-    <property name='ibs' type='boolean' value='false'/>
-    <property name='ds_cpl' type='boolean' value='false'/>
     <property name='ds-cpl' type='boolean' value='false'/>
-    <property name='host-phys-bits' type='boolean' value='false'/>
+    <property name='ibs' type='boolean' value='false'/>
     <property name='fma4' type='boolean' value='false'/>
     <property name='la57' type='boolean' value='true' migratable='yes'/>
     <property name='osvw' type='boolean' value='false'/>
-    <property name='check' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-spinlocks' type='number' value='-1'/>
-    <property name='pmu' type='boolean' value='false'/>
-    <property name='pmm' type='boolean' value='false'/>
     <property name='apic' type='boolean' value='true' migratable='yes'/>
+    <property name='pmm' type='boolean' value='false'/>
     <property name='spec-ctrl' type='boolean' value='false'/>
-    <property name='min-xlevel2' type='number' value='0'/>
     <property name='tsc-adjust' type='boolean' value='false'/>
-    <property name='tsc_adjust' type='boolean' value='false'/>
     <property name='kvm-steal-time' type='boolean' value='false'/>
-    <property name='kvm_steal_time' type='boolean' value='false'/>
     <property name='kvmclock' type='boolean' value='false'/>
-    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
     <property name='lwp' type='boolean' value='false'/>
     <property name='amd-ssbd' type='boolean' value='false'/>
-    <property name='ibpb' type='boolean' value='false'/>
     <property name='xop' type='boolean' value='false'/>
+    <property name='ibpb' type='boolean' value='false'/>
     <property name='avx' type='boolean' value='false'/>
     <property name='movdiri' type='boolean' value='false'/>
-    <property name='ace2' type='boolean' value='false'/>
-    <property name='avx512bw' type='boolean' value='false'/>
     <property name='acpi' type='boolean' value='true' migratable='yes'/>
-    <property name='hv-vapic' type='boolean' value='false'/>
+    <property name='avx512bw' type='boolean' value='false'/>
+    <property name='ace2' type='boolean' value='false'/>
     <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
     <property name='ht' type='boolean' value='false'/>
     <property name='nx' type='boolean' value='true' migratable='yes'/>
     <property name='pclmulqdq' type='boolean' value='true' migratable='yes'/>
     <property name='mmxext' type='boolean' value='true' migratable='yes'/>
-    <property name='vaes' type='boolean' value='false'/>
     <property name='popcnt' type='boolean' value='true' migratable='yes'/>
-    <property name='xsaves' type='boolean' value='false'/>
+    <property name='vaes' type='boolean' value='false'/>
     <property name='movdir64b' type='boolean' value='false'/>
-    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
+    <property name='xsaves' type='boolean' value='false'/>
     <property name='lm' type='boolean' value='true' migratable='yes'/>
     <property name='umip' type='boolean' value='false'/>
     <property name='pse' type='boolean' value='true' migratable='yes'/>
     <property name='avx2' type='boolean' value='false'/>
     <property name='sep' type='boolean' value='true' migratable='yes'/>
-    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
     <property name='virt-ssbd' type='boolean' value='false'/>
-    <property name='x-hv-max-vps' type='number' value='-1'/>
     <property name='nodeid-msr' type='boolean' value='false'/>
-    <property name='kvm' type='boolean' value='true' migratable='yes'/>
     <property name='misalignsse' type='boolean' value='false'/>
     <property name='min-xlevel' type='number' value='2147483658'/>
-    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
-    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
     <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-    <property name='realized' type='boolean' value='false'/>
-    <property name='tsc_scale' type='boolean' value='false'/>
+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
     <property name='tsc-scale' type='boolean' value='false'/>
     <property name='topoext' type='boolean' value='false'/>
-    <property name='hv-vpindex' type='boolean' value='false'/>
-    <property name='xlevel2' type='number' value='0'/>
     <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
     <property name='monitor' type='boolean' value='true' migratable='yes'/>
     <property name='avx512er' type='boolean' value='false'/>
     <property name='pmm-en' type='boolean' value='false'/>
@@ -936,25 +794,18 @@
     <property name='3dnow' type='boolean' value='true' migratable='yes'/>
     <property name='erms' type='boolean' value='true' migratable='yes'/>
     <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
     <property name='vpclmulqdq' type='boolean' value='false'/>
     <property name='fxsr-opt' type='boolean' value='false'/>
-    <property name='hv-synic' type='boolean' value='false'/>
     <property name='xstore' type='boolean' value='false'/>
-    <property name='fxsr_opt' type='boolean' value='false'/>
-    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
     <property name='rtm' type='boolean' value='false'/>
+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
     <property name='lmce' type='boolean' value='false'/>
-    <property name='hv-time' type='boolean' value='false'/>
     <property name='perfctr-nb' type='boolean' value='false'/>
-    <property name='perfctr_nb' type='boolean' value='false'/>
-    <property name='ffxsr' type='boolean' value='false'/>
-    <property name='hv-tlbflush' type='boolean' value='false'/>
     <property name='rdrand' type='boolean' value='false'/>
     <property name='rdseed' type='boolean' value='false'/>
     <property name='avx512-4vnniw' type='boolean' value='false'/>
-    <property name='vmx' type='boolean' value='false'/>
     <property name='vme' type='boolean' value='false'/>
+    <property name='vmx' type='boolean' value='false'/>
     <property name='dtes64' type='boolean' value='false'/>
     <property name='mtrr' type='boolean' value='true' migratable='yes'/>
     <property name='rdtscp' type='boolean' value='true' migratable='yes'/>
@@ -962,9 +813,8 @@
     <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
     <property name='tbm' type='boolean' value='false'/>
     <property name='wdt' type='boolean' value='false'/>
-    <property name='pause_filter' type='boolean' value='false'/>
-    <property name='sha-ni' type='boolean' value='false'/>
     <property name='model-id' type='string' value='QEMU TCG CPU version 2.5+'/>
+    <property name='sha-ni' type='boolean' value='false'/>
     <property name='abm' type='boolean' value='true' migratable='yes'/>
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
-- 
2.31.1

Re: [libvirt PATCH v3 6/6] qemu: drop support for full CPU model expansion

Posted by Jiri Denemark 1 month, 2 weeks ago
On Fri, Oct 08, 2021 at 10:01:45 +0100, Daniel P. Berrangé wrote:
> The "canonical CPU features" capability is a derivative of the
> "unavailable features" capability, which is exposed when seeing
> the "max" CPU models has the "unavailable-features" property.
> 
> This property was actually added back in QEMU version 2.8.0 per
> the QAPI schema
> 
>   @unavailable-features: List of properties that prevent
>                          the CPU model from running in the current
>                          host. (since 2.8)
> 
> so given our minimum QEMU version 2.11 there is no need to
> query this.
> 
> XXX strangely when we stop querying this, the domain
> capabilities data for CPUs changes significantly for QEMU
> versions less than 4.1.0. This suggests this code was masking
> a need for some other capability check that would trigger for
> QEMU < 4.1.0 ?

This is because QEMU_CAPS_CANONICAL_CPU_FEATURES was not enabled in the
capabilities data files for QEMU < 4.1.0. And since this feature is just
an alias for QEMU_CAPS_CPU_UNAVAILABLE_FEATURES, the situation is caused
by missing this UNAVAILABLE_FEATURES capability. And indeed
qom-list-properties on max-x86_64-cpu does not list unavailable-features
This property is only supported by query-cpu-definitions, which is what
you found in the QAPI schema. Similarly named property of a CPU class
was apparently added only in 4.1.0.

Fortunately QEMU_CAPS_CPU_UNAVAILABLE_FEATURES was only selected as a
conservative witness for QEMU which supports hyphens in all feature
names at the time I implemented this in libvirt.

That said, I believe it is safe to apply this patch. But please, rewrite
the misleading commit message.

And I think there's one more patch missing as we can now remove
QEMU_CAPS_CANONICAL_CPU_FEATURES completely (well, by adding the X_
prefix).

Jirka