[libvirt] [PATCH 17/24] qemu: Don't use full CPU model expansion

Wednesday, 19 June 2019

We used type=full expansion on the result of previous type=static
expansion to get all possible spellings of CPU features. Since we can
now translate the QEMU's canonical names to our names, we can drop this
magic and do only type=static CPU model expansion.

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt;
---
 src/qemu/qemu_capabilities.c                  |    9 +-
 .../caps_4.1.0.x86_64.replies                 | 1964 +----------------
 .../caps_4.1.0.x86_64.xml                     |  226 +-
 3 files changed, 48 insertions(+), 2151 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ada2bae18f..9ef1eabc95 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2494,10 +2494,13 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
 
     /* Some x86_64 features defined in cpu_map.xml use spelling which differ
      * from the one preferred by QEMU. Static expansion would give us only the
-     * preferred spelling, thus we need to do a full expansion on the result of
-     * the initial static expansion to get all variants of all features.
+     * 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))
+    if (ARCH_IS_X86(qemuCaps->arch) &&
+        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CANONICAL_CPU_FEATURES))
         type = QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC_FULL;
     else
         type = QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC;
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
index a07082781f..77de06bdd7 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
@@ -21321,495 +21321,6 @@
   "id": "libvirt-46"
 }
 
-{
-  "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,
-        "mds-no": false,
-        "pcommit": false,
-        "syscall": true,
-        "avx512dq": false,
-        "svm": false,
-        "invtsc": false,
-        "sse2": true,
-        "ssbd": false,
-        "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": false,
-        "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,
-        "md-clear": 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-47"
-}
-
-{
-  "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,
-        "mds-no": false,
-        "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": 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,
-        "pmm": false,
-        "pmu": 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,
-        "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,
-        "md-clear": 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-47"
-}
-
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
@@ -21821,7 +21332,7 @@
       }
     }
   },
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }
 
 {
@@ -22027,496 +21538,7 @@
       }
     }
   },
-  "id": "libvirt-48"
-}
-
-{
-  "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,
-        "mds-no": false,
-        "pcommit": false,
-        "syscall": true,
-        "avx512dq": false,
-        "svm": false,
-        "invtsc": false,
-        "sse2": true,
-        "ssbd": false,
-        "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": false,
-        "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,
-        "md-clear": 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-49"
-}
-
-{
-  "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,
-        "mds-no": false,
-        "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": 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,
-        "pmm": false,
-        "pmu": 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,
-        "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,
-        "md-clear": 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-49"
+  "id": "libvirt-47"
 }
 
 {
@@ -23473,495 +22495,6 @@
   "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,
-        "mds-no": false,
-        "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,
-        "md-clear": 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": true,
-        "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,
-        "mds-no": false,
-        "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,
-        "pmm": false,
-        "pmu": 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,
-        "md-clear": 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": true,
-        "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-4"
-}
-
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
@@ -23973,7 +22506,7 @@
       }
     }
   },
-  "id": "libvirt-5"
+  "id": "libvirt-4"
 }
 
 {
@@ -24179,494 +22712,5 @@
       }
     }
   },
-  "id": "libvirt-5"
-}
-
-{
-  "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,
-        "mds-no": false,
-        "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,
-        "md-clear": 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": true,
-        "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-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,
-        "mds-no": false,
-        "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,
-        "pmm": false,
-        "pmu": 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,
-        "md-clear": 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": true,
-        "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"
 }
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 4cc91e677e..0e546bae1e 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -213,9 +213,6 @@
   <package>v4.0.0-1173-g9c70209b63</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'/>
@@ -228,44 +225,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'/>
@@ -274,94 +254,67 @@
     <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='mds-no' type='boolean' value='false'/>
     <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='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='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'/>
@@ -371,7 +324,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'/>
@@ -379,70 +331,51 @@
     <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='pmm' type='boolean' value='false'/>
-    <property name='pmu' 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='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='md-clear' 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'/>
@@ -451,25 +384,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'/>
@@ -477,17 +403,13 @@
     <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'/>
   </hostCPU>
   <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'/>
@@ -500,44 +422,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'/>
@@ -546,94 +451,67 @@
     <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='mds-no' type='boolean' value='false'/>
     <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'/>
@@ -643,7 +521,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'/>
@@ -651,70 +528,51 @@
     <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='pmm' type='boolean' value='false'/>
-    <property name='pmu' 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='md-clear' 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'/>
@@ -723,25 +581,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='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='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'/>
@@ -749,9 +600,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.22.0


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

[libvirt] [PATCH 17/24] qemu: Don't use full CPU model expansion