From 597dd548f0d5a5ddf662ad748f1b1a9f0a456dce Mon Sep 17 00:00:00 2001
Message-Id: <597dd548f0d5a5ddf662ad748f1b1a9f0a456dce@dist-git>
From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 21 Jun 2019 09:25:53 +0200
Subject: [PATCH] qemu: Probe for "unavailable-features" CPU property
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It is similar to "filtered-features" property, which reports CPUID bits
corresponding to disabled features, but more general. The
"unavailable-features" property supports both CPUID and MSR features by
listing their names.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
(cherry picked from commit 0d254bce4ec6fd62c0277d24e28bf018a4c6cb37)

https://bugzilla.redhat.com/show_bug.cgi?id=1697627

Conflicts:
	src/qemu/qemu_capabilities.c
            - several capabilities check are missing

	tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
	tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
	tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
            - QMP message IDs are different

	tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
	tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
            - missing

	tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
	tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
	tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
            - file size based microcode version

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Message-Id: <2cf5c234b2b3e54250f0d8b1e12763d4f8e81247.1561068591.git.jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_capabilities.c                  |    8 +
 src/qemu/qemu_capabilities.h                  |    1 +
 .../caps_2.12.0.x86_64.replies                | 1078 ++++++++++++++-
 .../caps_2.12.0.x86_64.xml                    |    2 +-
 .../caps_3.0.0.x86_64.replies                 | 1116 +++++++++++++++-
 .../caps_3.0.0.x86_64.xml                     |    2 +-
 .../caps_4.1.0.x86_64.replies                 | 1188 ++++++++++++++++-
 .../caps_4.1.0.x86_64.xml                     |    3 +-
 8 files changed, 3317 insertions(+), 81 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 4515da4b91..beec9d1497 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -515,6 +515,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "zpci",
               "machine.pseries.cap-nested-hv",
               "x86-max-cpu",
+              "cpu-unavailable-features",
     );
 
 
@@ -1452,6 +1453,10 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsSPAPRMachine[] = {
     { "cap-nested-hv", QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV },
 };
 
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMaxX86CPU[] = {
+    { "unavailable-features", QEMU_CAPS_CPU_UNAVAILABLE_FEATURES },
+};
+
 static virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
     { "memory-backend-file", virQEMUCapsObjectPropsMemoryBackendFile,
       ARRAY_CARDINALITY(virQEMUCapsObjectPropsMemoryBackendFile),
@@ -1459,6 +1464,9 @@ static virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
     { "spapr-machine", virQEMUCapsObjectPropsSPAPRMachine,
       ARRAY_CARDINALITY(virQEMUCapsObjectPropsSPAPRMachine),
       -1 },
+    { "max-x86_64-cpu", virQEMUCapsObjectPropsMaxX86CPU,
+      ARRAY_CARDINALITY(virQEMUCapsObjectPropsMaxX86CPU),
+      QEMU_CAPS_X86_MAX_CPU },
 };
 
 static void
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 25ed5064b9..5aa41efdb0 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -495,6 +495,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_DEVICE_ZPCI, /* -device zpci */
     QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, /* -machine pseries.cap-nested-hv */
     QEMU_CAPS_X86_MAX_CPU, /* max-x86_64-cpu type exists */
+    QEMU_CAPS_CPU_UNAVAILABLE_FEATURES, /* "unavailable-features" CPU property */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
index 6f37e4301e..66a5577e5e 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -5011,10 +5011,1040 @@
 }
 
 {
-  "execute": "query-machines",
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "max-x86_64-cpu"
+  },
   "id": "libvirt-43"
 }
 
+{
+  "return": [
+    {
+      "name": "min-xlevel2",
+      "type": "uint32"
+    },
+    {
+      "name": "vendor",
+      "type": "string"
+    },
+    {
+      "name": "gfni",
+      "type": "bool"
+    },
+    {
+      "name": "clwb",
+      "type": "bool"
+    },
+    {
+      "name": "nx",
+      "type": "bool"
+    },
+    {
+      "name": "x2apic",
+      "type": "bool"
+    },
+    {
+      "name": "kvmclock-stable-bit",
+      "type": "bool"
+    },
+    {
+      "name": "vmcb_clean",
+      "type": "bool"
+    },
+    {
+      "name": "min-level",
+      "type": "uint32"
+    },
+    {
+      "name": "fxsr-opt",
+      "type": "bool"
+    },
+    {
+      "name": "skinit",
+      "type": "bool"
+    },
+    {
+      "name": "avx",
+      "type": "bool"
+    },
+    {
+      "name": "3dnowext",
+      "type": "bool"
+    },
+    {
+      "name": "hv-crash",
+      "type": "bool"
+    },
+    {
+      "name": "nodeid_msr",
+      "type": "bool"
+    },
+    {
+      "name": "hypervisor",
+      "type": "bool"
+    },
+    {
+      "name": "enforce",
+      "type": "bool"
+    },
+    {
+      "name": "stepping",
+      "type": "int"
+    },
+    {
+      "name": "sse4_2",
+      "type": "bool"
+    },
+    {
+      "name": "sse4_1",
+      "type": "bool"
+    },
+    {
+      "name": "x-hv-max-vps",
+      "type": "int32"
+    },
+    {
+      "name": "hv-frequencies",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-hint-dedicated",
+      "type": "bool"
+    },
+    {
+      "name": "cmp_legacy",
+      "type": "bool"
+    },
+    {
+      "name": "tm2",
+      "type": "bool"
+    },
+    {
+      "name": "smx",
+      "type": "bool"
+    },
+    {
+      "name": "host-cache-info",
+      "type": "bool"
+    },
+    {
+      "name": "hv-vendor-id",
+      "type": "str"
+    },
+    {
+      "name": "movbe",
+      "type": "bool"
+    },
+    {
+      "name": "3dnowprefetch",
+      "type": "bool"
+    },
+    {
+      "name": "mtrr",
+      "type": "bool"
+    },
+    {
+      "name": "wdt",
+      "type": "bool"
+    },
+    {
+      "name": "thread-id",
+      "type": "int32"
+    },
+    {
+      "name": "aes",
+      "type": "bool"
+    },
+    {
+      "name": "apic-id",
+      "type": "uint32"
+    },
+    {
+      "name": "lm",
+      "type": "bool"
+    },
+    {
+      "name": "family",
+      "type": "int"
+    },
+    {
+      "name": "tsc-adjust",
+      "type": "bool"
+    },
+    {
+      "name": "pfthreshold",
+      "type": "bool"
+    },
+    {
+      "name": "ospke",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-no-smi-migration",
+      "type": "bool"
+    },
+    {
+      "name": "pse",
+      "type": "bool"
+    },
+    {
+      "name": "filtered-features",
+      "type": "X86CPUFeatureWordInfo"
+    },
+    {
+      "name": "hv-vpindex",
+      "type": "bool"
+    },
+    {
+      "name": "adx",
+      "type": "bool"
+    },
+    {
+      "name": "avx512bitalg",
+      "type": "bool"
+    },
+    {
+      "name": "i64",
+      "type": "bool"
+    },
+    {
+      "name": "vaes",
+      "type": "bool"
+    },
+    {
+      "name": "ia64",
+      "type": "bool"
+    },
+    {
+      "name": "nodeid-msr",
+      "type": "bool"
+    },
+    {
+      "name": "ibpb",
+      "type": "bool"
+    },
+    {
+      "name": "hv-synic",
+      "type": "bool"
+    },
+    {
+      "name": "ibs",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_mmu",
+      "type": "bool"
+    },
+    {
+      "name": "tcg-cpuid",
+      "type": "bool"
+    },
+    {
+      "name": "nrip_save",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_nopiodelay",
+      "type": "bool"
+    },
+    {
+      "name": "lbrv",
+      "type": "bool"
+    },
+    {
+      "name": "rdtscp",
+      "type": "bool"
+    },
+    {
+      "name": "memory",
+      "type": "link<qemu:memory-region>"
+    },
+    {
+      "name": "avx512vbmi2",
+      "type": "bool"
+    },
+    {
+      "name": "ace2-en",
+      "type": "bool"
+    },
+    {
+      "name": "invtsc",
+      "type": "bool"
+    },
+    {
+      "name": "sse4.2",
+      "type": "bool"
+    },
+    {
+      "name": "sse4.1",
+      "type": "bool"
+    },
+    {
+      "name": "pbe",
+      "type": "bool"
+    },
+    {
+      "name": "rdrand",
+      "type": "bool"
+    },
+    {
+      "name": "socket-id",
+      "type": "int32"
+    },
+    {
+      "name": "hotpluggable",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-steal-time",
+      "type": "bool"
+    },
+    {
+      "name": "l3-cache",
+      "type": "bool"
+    },
+    {
+      "name": "vmware-cpuid-freq",
+      "type": "bool"
+    },
+    {
+      "name": "xop",
+      "type": "bool"
+    },
+    {
+      "name": "tsc-frequency",
+      "type": "int"
+    },
+    {
+      "name": "fill-mtrr-mask",
+      "type": "bool"
+    },
+    {
+      "name": "core-id",
+      "type": "int32"
+    },
+    {
+      "name": "intel-pt",
+      "type": "bool"
+    },
+    {
+      "name": "pat",
+      "type": "bool"
+    },
+    {
+      "name": "pcid",
+      "type": "bool"
+    },
+    {
+      "name": "pclmulqdq",
+      "type": "bool"
+    },
+    {
+      "name": "sse4-2",
+      "type": "bool"
+    },
+    {
+      "name": "sse4-1",
+      "type": "bool"
+    },
+    {
+      "name": "sha-ni",
+      "type": "bool"
+    },
+    {
+      "name": "cmov",
+      "type": "bool"
+    },
+    {
+      "name": "pae",
+      "type": "bool"
+    },
+    {
+      "name": "smep",
+      "type": "bool"
+    },
+    {
+      "name": "abm",
+      "type": "bool"
+    },
+    {
+      "name": "xstore",
+      "type": "bool"
+    },
+    {
+      "name": "tsc_adjust",
+      "type": "bool"
+    },
+    {
+      "name": "type",
+      "type": "string"
+    },
+    {
+      "name": "kvm-asyncpf",
+      "type": "bool"
+    },
+    {
+      "name": "min-xlevel",
+      "type": "uint32"
+    },
+    {
+      "name": "pdpe1gb",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-mmu",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-pv-unhalt",
+      "type": "bool"
+    },
+    {
+      "name": "avx512f",
+      "type": "bool"
+    },
+    {
+      "name": "avx512vbmi",
+      "type": "bool"
+    },
+    {
+      "name": "avx512-4vnniw",
+      "type": "bool"
+    },
+    {
+      "name": "xd",
+      "type": "bool"
+    },
+    {
+      "name": "mmxext",
+      "type": "bool"
+    },
+    {
+      "name": "decodeassists",
+      "type": "bool"
+    },
+    {
+      "name": "ht",
+      "type": "bool"
+    },
+    {
+      "name": "xsave",
+      "type": "bool"
+    },
+    {
+      "name": "perfctr_core",
+      "type": "bool"
+    },
+    {
+      "name": "feature-words",
+      "type": "X86CPUFeatureWordInfo"
+    },
+    {
+      "name": "migratable",
+      "type": "bool"
+    },
+    {
+      "name": "3dnow",
+      "type": "bool"
+    },
+    {
+      "name": "spec-ctrl",
+      "type": "bool"
+    },
+    {
+      "name": "model",
+      "type": "int"
+    },
+    {
+      "name": "nrip-save",
+      "type": "bool"
+    },
+    {
+      "name": "lwp",
+      "type": "bool"
+    },
+    {
+      "name": "xstore-en",
+      "type": "bool"
+    },
+    {
+      "name": "avx512vl",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_pv_unhalt",
+      "type": "bool"
+    },
+    {
+      "name": "bmi2",
+      "type": "bool"
+    },
+    {
+      "name": "bmi1",
+      "type": "bool"
+    },
+    {
+      "name": "la57",
+      "type": "bool"
+    },
+    {
+      "name": "ffxsr",
+      "type": "bool"
+    },
+    {
+      "name": "vmcb-clean",
+      "type": "bool"
+    },
+    {
+      "name": "pause-filter",
+      "type": "bool"
+    },
+    {
+      "name": "pni",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_steal_time",
+      "type": "bool"
+    },
+    {
+      "name": "svm_lock",
+      "type": "bool"
+    },
+    {
+      "name": "pse36",
+      "type": "bool"
+    },
+    {
+      "name": "hv-stimer",
+      "type": "bool"
+    },
+    {
+      "name": "host-phys-bits",
+      "type": "bool"
+    },
+    {
+      "name": "extapic",
+      "type": "bool"
+    },
+    {
+      "name": "hv-spinlocks",
+      "type": "int"
+    },
+    {
+      "name": "pmu",
+      "type": "bool"
+    },
+    {
+      "name": "pmm",
+      "type": "bool"
+    },
+    {
+      "name": "vpclmulqdq",
+      "type": "bool"
+    },
+    {
+      "name": "avx512-vpopcntdq",
+      "type": "bool"
+    },
+    {
+      "name": "avx512er",
+      "type": "bool"
+    },
+    {
+      "name": "pdcm",
+      "type": "bool"
+    },
+    {
+      "name": "svm",
+      "type": "bool"
+    },
+    {
+      "name": "apic",
+      "type": "bool"
+    },
+    {
+      "name": "xcrypt-en",
+      "type": "bool"
+    },
+    {
+      "name": "cr8legacy",
+      "type": "bool"
+    },
+    {
+      "name": "fma4",
+      "type": "bool"
+    },
+    {
+      "name": "erms",
+      "type": "bool"
+    },
+    {
+      "name": "msr",
+      "type": "bool"
+    },
+    {
+      "name": "ds_cpl",
+      "type": "bool"
+    },
+    {
+      "name": "xlevel",
+      "type": "uint32"
+    },
+    {
+      "name": "hotplugged",
+      "type": "bool"
+    },
+    {
+      "name": "hv-relaxed",
+      "type": "bool"
+    },
+    {
+      "name": "perfctr-core",
+      "type": "bool"
+    },
+    {
+      "name": "sep",
+      "type": "bool"
+    },
+    {
+      "name": "smap",
+      "type": "bool"
+    },
+    {
+      "name": "sse3",
+      "type": "bool"
+    },
+    {
+      "name": "avx512dq",
+      "type": "bool"
+    },
+    {
+      "name": "ssse3",
+      "type": "bool"
+    },
+    {
+      "name": "pmm-en",
+      "type": "bool"
+    },
+    {
+      "name": "npt",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-pv-tlb-flush",
+      "type": "bool"
+    },
+    {
+      "name": "tsc",
+      "type": "bool"
+    },
+    {
+      "name": "monitor",
+      "type": "bool"
+    },
+    {
+      "name": "f16c",
+      "type": "bool"
+    },
+    {
+      "name": "sse2",
+      "type": "bool"
+    },
+    {
+      "name": "rdpid",
+      "type": "bool"
+    },
+    {
+      "name": "mce",
+      "type": "bool"
+    },
+    {
+      "name": "full-cpuid-auto-level",
+      "type": "bool"
+    },
+    {
+      "name": "xtpr",
+      "type": "bool"
+    },
+    {
+      "name": "mca",
+      "type": "bool"
+    },
+    {
+      "name": "cid",
+      "type": "bool"
+    },
+    {
+      "name": "tm",
+      "type": "bool"
+    },
+    {
+      "name": "pku",
+      "type": "bool"
+    },
+    {
+      "name": "avx512vnni",
+      "type": "bool"
+    },
+    {
+      "name": "tce",
+      "type": "bool"
+    },
+    {
+      "name": "kvmclock",
+      "type": "bool"
+    },
+    {
+      "name": "sse4a",
+      "type": "bool"
+    },
+    {
+      "name": "ds",
+      "type": "bool"
+    },
+    {
+      "name": "lahf-lm",
+      "type": "bool"
+    },
+    {
+      "name": "xsaves",
+      "type": "bool"
+    },
+    {
+      "name": "clflushopt",
+      "type": "bool"
+    },
+    {
+      "name": "kvm",
+      "type": "bool"
+    },
+    {
+      "name": "ss",
+      "type": "bool"
+    },
+    {
+      "name": "flushbyasid",
+      "type": "bool"
+    },
+    {
+      "name": "pause_filter",
+      "type": "bool"
+    },
+    {
+      "name": "de",
+      "type": "bool"
+    },
+    {
+      "name": "est",
+      "type": "bool"
+    },
+    {
+      "name": "check",
+      "type": "bool"
+    },
+    {
+      "name": "lahf_lm",
+      "type": "bool"
+    },
+    {
+      "name": "dtes64",
+      "type": "bool"
+    },
+    {
+      "name": "vmx",
+      "type": "bool"
+    },
+    {
+      "name": "xsavec",
+      "type": "bool"
+    },
+    {
+      "name": "svm-lock",
+      "type": "bool"
+    },
+    {
+      "name": "avx512ifma",
+      "type": "bool"
+    },
+    {
+      "name": "clflush",
+      "type": "bool"
+    },
+    {
+      "name": "rdseed",
+      "type": "bool"
+    },
+    {
+      "name": "avx512cd",
+      "type": "bool"
+    },
+    {
+      "name": "xsaveopt",
+      "type": "bool"
+    },
+    {
+      "name": "tbm",
+      "type": "bool"
+    },
+    {
+      "name": "ace2",
+      "type": "bool"
+    },
+    {
+      "name": "vme",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_asyncpf",
+      "type": "bool"
+    },
+    {
+      "name": "hv-vapic",
+      "type": "bool"
+    },
+    {
+      "name": "parent_bus",
+      "type": "link<bus>"
+    },
+    {
+      "name": "lmce",
+      "type": "bool"
+    },
+    {
+      "name": "hv-reset",
+      "type": "bool"
+    },
+    {
+      "name": "hv-runtime",
+      "type": "bool"
+    },
+    {
+      "name": "avx512bw",
+      "type": "bool"
+    },
+    {
+      "name": "xcrypt",
+      "type": "bool"
+    },
+    {
+      "name": "fpu",
+      "type": "bool"
+    },
+    {
+      "name": "fxsr",
+      "type": "bool"
+    },
+    {
+      "name": "ds-cpl",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-pv-eoi",
+      "type": "bool"
+    },
+    {
+      "name": "hle",
+      "type": "bool"
+    },
+    {
+      "name": "cx8",
+      "type": "bool"
+    },
+    {
+      "name": "mpx",
+      "type": "bool"
+    },
+    {
+      "name": "invpcid",
+      "type": "bool"
+    },
+    {
+      "name": "pcommit",
+      "type": "bool"
+    },
+    {
+      "name": "arat",
+      "type": "bool"
+    },
+    {
+      "name": "sse",
+      "type": "bool"
+    },
+    {
+      "name": "syscall",
+      "type": "bool"
+    },
+    {
+      "name": "tsc_scale",
+      "type": "bool"
+    },
+    {
+      "name": "xlevel2",
+      "type": "uint32"
+    },
+    {
+      "name": "hv-time",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_pv_eoi",
+      "type": "bool"
+    },
+    {
+      "name": "osvw",
+      "type": "bool"
+    },
+    {
+      "name": "perfctr-nb",
+      "type": "bool"
+    },
+    {
+      "name": "rtm",
+      "type": "bool"
+    },
+    {
+      "name": "avx512-4fmaps",
+      "type": "bool"
+    },
+    {
+      "name": "avx2",
+      "type": "bool"
+    },
+    {
+      "name": "perfctr_nb",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-nopiodelay",
+      "type": "bool"
+    },
+    {
+      "name": "phys-bits",
+      "type": "uint32"
+    },
+    {
+      "name": "avx512pf",
+      "type": "bool"
+    },
+    {
+      "name": "level",
+      "type": "uint32"
+    },
+    {
+      "name": "osxsave",
+      "type": "bool"
+    },
+    {
+      "name": "cpuid-0xb",
+      "type": "bool"
+    },
+    {
+      "name": "tsc-deadline",
+      "type": "bool"
+    },
+    {
+      "name": "xgetbv1",
+      "type": "bool"
+    },
+    {
+      "name": "fxsr_opt",
+      "type": "bool"
+    },
+    {
+      "name": "popcnt",
+      "type": "bool"
+    },
+    {
+      "name": "umip",
+      "type": "bool"
+    },
+    {
+      "name": "realized",
+      "type": "bool"
+    },
+    {
+      "name": "phe",
+      "type": "bool"
+    },
+    {
+      "name": "cmp-legacy",
+      "type": "bool"
+    },
+    {
+      "name": "dca",
+      "type": "bool"
+    },
+    {
+      "name": "acpi",
+      "type": "bool"
+    },
+    {
+      "name": "pn",
+      "type": "bool"
+    },
+    {
+      "name": "model-id",
+      "type": "string"
+    },
+    {
+      "name": "crash-information",
+      "type": "GuestPanicInformation"
+    },
+    {
+      "name": "tsc-scale",
+      "type": "bool"
+    },
+    {
+      "name": "node-id",
+      "type": "int32"
+    },
+    {
+      "name": "cx16",
+      "type": "bool"
+    },
+    {
+      "name": "mmx",
+      "type": "bool"
+    },
+    {
+      "name": "topoext",
+      "type": "bool"
+    },
+    {
+      "name": "pge",
+      "type": "bool"
+    },
+    {
+      "name": "fsgsbase",
+      "type": "bool"
+    },
+    {
+      "name": "pclmuldq",
+      "type": "bool"
+    },
+    {
+      "name": "misalignsse",
+      "type": "bool"
+    },
+    {
+      "name": "phe-en",
+      "type": "bool"
+    },
+    {
+      "name": "fma",
+      "type": "bool"
+    }
+  ],
+  "id": "libvirt-43"
+}
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-44"
+}
+
 {
   "return": [
     {
@@ -5211,12 +6241,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -5730,12 +6760,12 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
   "execute": "query-tpm-models",
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -5743,12 +6773,12 @@
     "tpm-crb",
     "tpm-tis"
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
   "execute": "query-tpm-types",
-  "id": "libvirt-46"
+  "id": "libvirt-47"
 }
 
 {
@@ -5756,12 +6786,12 @@
     "passthrough",
     "emulator"
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-47"
 }
 
 {
   "execute": "query-command-line-options",
-  "id": "libvirt-47"
+  "id": "libvirt-48"
 }
 
 {
@@ -7048,12 +8078,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-48"
 }
 
 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-48"
+  "id": "libvirt-49"
 }
 
 {
@@ -7115,12 +8145,12 @@
       "capability": "dirty-bitmaps"
     }
   ],
-  "id": "libvirt-48"
+  "id": "libvirt-49"
 }
 
 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-49"
+  "id": "libvirt-50"
 }
 
 {
@@ -18488,7 +19518,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-49"
+  "id": "libvirt-50"
 }
 
 {
@@ -18499,7 +19529,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-51"
 }
 
 {
@@ -18689,7 +19719,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-51"
 }
 
 {
@@ -18881,7 +19911,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -19136,7 +20166,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -19150,7 +20180,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
@@ -19340,7 +20370,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
@@ -19532,7 +20562,7 @@
       }
     }
   },
-  "id": "libvirt-53"
+  "id": "libvirt-54"
 }
 
 {
@@ -19787,12 +20817,12 @@
       }
     }
   },
-  "id": "libvirt-53"
+  "id": "libvirt-54"
 }
 
 {
   "execute": "query-sev-capabilities",
-  "id": "libvirt-54"
+  "id": "libvirt-55"
 }
 
 {
@@ -19802,7 +20832,7 @@
     "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA",
     "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA"
   },
-  "id": "libvirt-54"
+  "id": "libvirt-55"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index f4416e7b55..a8a82ca110 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -216,7 +216,7 @@
   <flag name='x86-max-cpu'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>416196</microcodeVersion>
+  <microcodeVersion>431483</microcodeVersion>
   <package>v2.12.0-rc0</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
index b2f8377248..9f44eb4fae 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
@@ -5123,10 +5123,1072 @@
 }
 
 {
-  "execute": "query-machines",
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "max-x86_64-cpu"
+  },
   "id": "libvirt-43"
 }
 
+{
+  "return": [
+    {
+      "name": "min-xlevel2",
+      "type": "uint32"
+    },
+    {
+      "name": "amd-ssbd",
+      "type": "bool"
+    },
+    {
+      "name": "vendor",
+      "type": "string"
+    },
+    {
+      "name": "gfni",
+      "type": "bool"
+    },
+    {
+      "name": "clwb",
+      "type": "bool"
+    },
+    {
+      "name": "nx",
+      "type": "bool"
+    },
+    {
+      "name": "x2apic",
+      "type": "bool"
+    },
+    {
+      "name": "kvmclock-stable-bit",
+      "type": "bool"
+    },
+    {
+      "name": "vmcb_clean",
+      "type": "bool"
+    },
+    {
+      "name": "min-level",
+      "type": "uint32"
+    },
+    {
+      "name": "fxsr-opt",
+      "type": "bool"
+    },
+    {
+      "name": "skinit",
+      "type": "bool"
+    },
+    {
+      "name": "avx",
+      "type": "bool"
+    },
+    {
+      "name": "3dnowext",
+      "type": "bool"
+    },
+    {
+      "name": "nodeid_msr",
+      "type": "bool"
+    },
+    {
+      "name": "hv-crash",
+      "type": "bool"
+    },
+    {
+      "name": "hypervisor",
+      "type": "bool"
+    },
+    {
+      "name": "enforce",
+      "type": "bool"
+    },
+    {
+      "name": "stepping",
+      "type": "int"
+    },
+    {
+      "name": "sse4_2",
+      "type": "bool"
+    },
+    {
+      "name": "sse4_1",
+      "type": "bool"
+    },
+    {
+      "name": "x-hv-max-vps",
+      "type": "int32"
+    },
+    {
+      "name": "hv-frequencies",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-hint-dedicated",
+      "type": "bool"
+    },
+    {
+      "name": "cmp_legacy",
+      "type": "bool"
+    },
+    {
+      "name": "tm2",
+      "type": "bool"
+    },
+    {
+      "name": "smx",
+      "type": "bool"
+    },
+    {
+      "name": "host-cache-info",
+      "type": "bool"
+    },
+    {
+      "name": "hv-vendor-id",
+      "type": "str"
+    },
+    {
+      "name": "movbe",
+      "type": "bool"
+    },
+    {
+      "name": "3dnowprefetch",
+      "type": "bool"
+    },
+    {
+      "name": "mtrr",
+      "type": "bool"
+    },
+    {
+      "name": "wdt",
+      "type": "bool"
+    },
+    {
+      "name": "thread-id",
+      "type": "int32"
+    },
+    {
+      "name": "aes",
+      "type": "bool"
+    },
+    {
+      "name": "apic-id",
+      "type": "uint32"
+    },
+    {
+      "name": "lm",
+      "type": "bool"
+    },
+    {
+      "name": "family",
+      "type": "int"
+    },
+    {
+      "name": "tsc-adjust",
+      "type": "bool"
+    },
+    {
+      "name": "pfthreshold",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-no-smi-migration",
+      "type": "bool"
+    },
+    {
+      "name": "amd-no-ssb",
+      "type": "bool"
+    },
+    {
+      "name": "pse",
+      "type": "bool"
+    },
+    {
+      "name": "filtered-features",
+      "type": "X86CPUFeatureWordInfo"
+    },
+    {
+      "name": "hv-vpindex",
+      "type": "bool"
+    },
+    {
+      "name": "adx",
+      "type": "bool"
+    },
+    {
+      "name": "avx512bitalg",
+      "type": "bool"
+    },
+    {
+      "name": "i64",
+      "type": "bool"
+    },
+    {
+      "name": "vaes",
+      "type": "bool"
+    },
+    {
+      "name": "ia64",
+      "type": "bool"
+    },
+    {
+      "name": "nodeid-msr",
+      "type": "bool"
+    },
+    {
+      "name": "ibpb",
+      "type": "bool"
+    },
+    {
+      "name": "hv-synic",
+      "type": "bool"
+    },
+    {
+      "name": "ibs",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_mmu",
+      "type": "bool"
+    },
+    {
+      "name": "tcg-cpuid",
+      "type": "bool"
+    },
+    {
+      "name": "nrip_save",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_nopiodelay",
+      "type": "bool"
+    },
+    {
+      "name": "lbrv",
+      "type": "bool"
+    },
+    {
+      "name": "rdtscp",
+      "type": "bool"
+    },
+    {
+      "name": "memory",
+      "type": "link<qemu:memory-region>"
+    },
+    {
+      "name": "avx512vbmi2",
+      "type": "bool"
+    },
+    {
+      "name": "ace2-en",
+      "type": "bool"
+    },
+    {
+      "name": "invtsc",
+      "type": "bool"
+    },
+    {
+      "name": "sse4.2",
+      "type": "bool"
+    },
+    {
+      "name": "sse4.1",
+      "type": "bool"
+    },
+    {
+      "name": "pbe",
+      "type": "bool"
+    },
+    {
+      "name": "rdrand",
+      "type": "bool"
+    },
+    {
+      "name": "socket-id",
+      "type": "int32"
+    },
+    {
+      "name": "hotpluggable",
+      "type": "bool"
+    },
+    {
+      "name": "l3-cache",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-steal-time",
+      "type": "bool"
+    },
+    {
+      "name": "vmware-cpuid-freq",
+      "type": "bool"
+    },
+    {
+      "name": "legacy-cache",
+      "type": "bool"
+    },
+    {
+      "name": "xop",
+      "type": "bool"
+    },
+    {
+      "name": "tsc-frequency",
+      "type": "int"
+    },
+    {
+      "name": "fill-mtrr-mask",
+      "type": "bool"
+    },
+    {
+      "name": "core-id",
+      "type": "int32"
+    },
+    {
+      "name": "intel-pt",
+      "type": "bool"
+    },
+    {
+      "name": "pat",
+      "type": "bool"
+    },
+    {
+      "name": "pcid",
+      "type": "bool"
+    },
+    {
+      "name": "pclmulqdq",
+      "type": "bool"
+    },
+    {
+      "name": "sse4-2",
+      "type": "bool"
+    },
+    {
+      "name": "sse4-1",
+      "type": "bool"
+    },
+    {
+      "name": "sha-ni",
+      "type": "bool"
+    },
+    {
+      "name": "cmov",
+      "type": "bool"
+    },
+    {
+      "name": "pae",
+      "type": "bool"
+    },
+    {
+      "name": "smep",
+      "type": "bool"
+    },
+    {
+      "name": "virt-ssbd",
+      "type": "bool"
+    },
+    {
+      "name": "abm",
+      "type": "bool"
+    },
+    {
+      "name": "xstore",
+      "type": "bool"
+    },
+    {
+      "name": "tsc_adjust",
+      "type": "bool"
+    },
+    {
+      "name": "type",
+      "type": "string"
+    },
+    {
+      "name": "kvm-asyncpf",
+      "type": "bool"
+    },
+    {
+      "name": "pdpe1gb",
+      "type": "bool"
+    },
+    {
+      "name": "min-xlevel",
+      "type": "uint32"
+    },
+    {
+      "name": "kvm-mmu",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-pv-unhalt",
+      "type": "bool"
+    },
+    {
+      "name": "avx512f",
+      "type": "bool"
+    },
+    {
+      "name": "avx512vbmi",
+      "type": "bool"
+    },
+    {
+      "name": "avx512-4vnniw",
+      "type": "bool"
+    },
+    {
+      "name": "xd",
+      "type": "bool"
+    },
+    {
+      "name": "mmxext",
+      "type": "bool"
+    },
+    {
+      "name": "decodeassists",
+      "type": "bool"
+    },
+    {
+      "name": "ht",
+      "type": "bool"
+    },
+    {
+      "name": "xsave",
+      "type": "bool"
+    },
+    {
+      "name": "perfctr_core",
+      "type": "bool"
+    },
+    {
+      "name": "feature-words",
+      "type": "X86CPUFeatureWordInfo"
+    },
+    {
+      "name": "migratable",
+      "type": "bool"
+    },
+    {
+      "name": "3dnow",
+      "type": "bool"
+    },
+    {
+      "name": "spec-ctrl",
+      "type": "bool"
+    },
+    {
+      "name": "model",
+      "type": "int"
+    },
+    {
+      "name": "nrip-save",
+      "type": "bool"
+    },
+    {
+      "name": "lwp",
+      "type": "bool"
+    },
+    {
+      "name": "xstore-en",
+      "type": "bool"
+    },
+    {
+      "name": "avx512vl",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_pv_unhalt",
+      "type": "bool"
+    },
+    {
+      "name": "bmi2",
+      "type": "bool"
+    },
+    {
+      "name": "bmi1",
+      "type": "bool"
+    },
+    {
+      "name": "la57",
+      "type": "bool"
+    },
+    {
+      "name": "ffxsr",
+      "type": "bool"
+    },
+    {
+      "name": "vmcb-clean",
+      "type": "bool"
+    },
+    {
+      "name": "pause-filter",
+      "type": "bool"
+    },
+    {
+      "name": "pni",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_steal_time",
+      "type": "bool"
+    },
+    {
+      "name": "svm_lock",
+      "type": "bool"
+    },
+    {
+      "name": "pse36",
+      "type": "bool"
+    },
+    {
+      "name": "hv-stimer",
+      "type": "bool"
+    },
+    {
+      "name": "host-phys-bits",
+      "type": "bool"
+    },
+    {
+      "name": "extapic",
+      "type": "bool"
+    },
+    {
+      "name": "hv-spinlocks",
+      "type": "int"
+    },
+    {
+      "name": "pmu",
+      "type": "bool"
+    },
+    {
+      "name": "pmm",
+      "type": "bool"
+    },
+    {
+      "name": "vpclmulqdq",
+      "type": "bool"
+    },
+    {
+      "name": "avx512-vpopcntdq",
+      "type": "bool"
+    },
+    {
+      "name": "avx512er",
+      "type": "bool"
+    },
+    {
+      "name": "pdcm",
+      "type": "bool"
+    },
+    {
+      "name": "svm",
+      "type": "bool"
+    },
+    {
+      "name": "apic",
+      "type": "bool"
+    },
+    {
+      "name": "xcrypt-en",
+      "type": "bool"
+    },
+    {
+      "name": "cr8legacy",
+      "type": "bool"
+    },
+    {
+      "name": "fma4",
+      "type": "bool"
+    },
+    {
+      "name": "erms",
+      "type": "bool"
+    },
+    {
+      "name": "msr",
+      "type": "bool"
+    },
+    {
+      "name": "ds_cpl",
+      "type": "bool"
+    },
+    {
+      "name": "xlevel",
+      "type": "uint32"
+    },
+    {
+      "name": "sep",
+      "type": "bool"
+    },
+    {
+      "name": "hotplugged",
+      "type": "bool"
+    },
+    {
+      "name": "hv-relaxed",
+      "type": "bool"
+    },
+    {
+      "name": "cldemote",
+      "type": "bool"
+    },
+    {
+      "name": "perfctr-core",
+      "type": "bool"
+    },
+    {
+      "name": "avx512vnni",
+      "type": "bool"
+    },
+    {
+      "name": "smap",
+      "type": "bool"
+    },
+    {
+      "name": "sse3",
+      "type": "bool"
+    },
+    {
+      "name": "avx512dq",
+      "type": "bool"
+    },
+    {
+      "name": "ssse3",
+      "type": "bool"
+    },
+    {
+      "name": "pmm-en",
+      "type": "bool"
+    },
+    {
+      "name": "npt",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-pv-tlb-flush",
+      "type": "bool"
+    },
+    {
+      "name": "tsc",
+      "type": "bool"
+    },
+    {
+      "name": "monitor",
+      "type": "bool"
+    },
+    {
+      "name": "f16c",
+      "type": "bool"
+    },
+    {
+      "name": "sse2",
+      "type": "bool"
+    },
+    {
+      "name": "rdpid",
+      "type": "bool"
+    },
+    {
+      "name": "mce",
+      "type": "bool"
+    },
+    {
+      "name": "full-cpuid-auto-level",
+      "type": "bool"
+    },
+    {
+      "name": "xtpr",
+      "type": "bool"
+    },
+    {
+      "name": "mca",
+      "type": "bool"
+    },
+    {
+      "name": "cid",
+      "type": "bool"
+    },
+    {
+      "name": "tm",
+      "type": "bool"
+    },
+    {
+      "name": "pku",
+      "type": "bool"
+    },
+    {
+      "name": "hv-tlbflush",
+      "type": "bool"
+    },
+    {
+      "name": "ds",
+      "type": "bool"
+    },
+    {
+      "name": "kvmclock",
+      "type": "bool"
+    },
+    {
+      "name": "tce",
+      "type": "bool"
+    },
+    {
+      "name": "sse4a",
+      "type": "bool"
+    },
+    {
+      "name": "lahf-lm",
+      "type": "bool"
+    },
+    {
+      "name": "xsaves",
+      "type": "bool"
+    },
+    {
+      "name": "clflushopt",
+      "type": "bool"
+    },
+    {
+      "name": "kvm",
+      "type": "bool"
+    },
+    {
+      "name": "ss",
+      "type": "bool"
+    },
+    {
+      "name": "flushbyasid",
+      "type": "bool"
+    },
+    {
+      "name": "md-clear",
+      "type": "bool"
+    },
+    {
+      "name": "pause_filter",
+      "type": "bool"
+    },
+    {
+      "name": "de",
+      "type": "bool"
+    },
+    {
+      "name": "est",
+      "type": "bool"
+    },
+    {
+      "name": "check",
+      "type": "bool"
+    },
+    {
+      "name": "lahf_lm",
+      "type": "bool"
+    },
+    {
+      "name": "dtes64",
+      "type": "bool"
+    },
+    {
+      "name": "vmx",
+      "type": "bool"
+    },
+    {
+      "name": "xsavec",
+      "type": "bool"
+    },
+    {
+      "name": "svm-lock",
+      "type": "bool"
+    },
+    {
+      "name": "avx512ifma",
+      "type": "bool"
+    },
+    {
+      "name": "clflush",
+      "type": "bool"
+    },
+    {
+      "name": "rdseed",
+      "type": "bool"
+    },
+    {
+      "name": "avx512cd",
+      "type": "bool"
+    },
+    {
+      "name": "xsaveopt",
+      "type": "bool"
+    },
+    {
+      "name": "tbm",
+      "type": "bool"
+    },
+    {
+      "name": "ace2",
+      "type": "bool"
+    },
+    {
+      "name": "vme",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_asyncpf",
+      "type": "bool"
+    },
+    {
+      "name": "hv-vapic",
+      "type": "bool"
+    },
+    {
+      "name": "parent_bus",
+      "type": "link<bus>"
+    },
+    {
+      "name": "lmce",
+      "type": "bool"
+    },
+    {
+      "name": "x-migrate-smi-count",
+      "type": "bool"
+    },
+    {
+      "name": "hv-reset",
+      "type": "bool"
+    },
+    {
+      "name": "hv-runtime",
+      "type": "bool"
+    },
+    {
+      "name": "ssbd",
+      "type": "bool"
+    },
+    {
+      "name": "avx512bw",
+      "type": "bool"
+    },
+    {
+      "name": "xcrypt",
+      "type": "bool"
+    },
+    {
+      "name": "fpu",
+      "type": "bool"
+    },
+    {
+      "name": "fxsr",
+      "type": "bool"
+    },
+    {
+      "name": "ds-cpl",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-pv-eoi",
+      "type": "bool"
+    },
+    {
+      "name": "hle",
+      "type": "bool"
+    },
+    {
+      "name": "cx8",
+      "type": "bool"
+    },
+    {
+      "name": "mpx",
+      "type": "bool"
+    },
+    {
+      "name": "invpcid",
+      "type": "bool"
+    },
+    {
+      "name": "pcommit",
+      "type": "bool"
+    },
+    {
+      "name": "arat",
+      "type": "bool"
+    },
+    {
+      "name": "sse",
+      "type": "bool"
+    },
+    {
+      "name": "syscall",
+      "type": "bool"
+    },
+    {
+      "name": "tsc_scale",
+      "type": "bool"
+    },
+    {
+      "name": "xlevel2",
+      "type": "uint32"
+    },
+    {
+      "name": "hv-time",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_pv_eoi",
+      "type": "bool"
+    },
+    {
+      "name": "osvw",
+      "type": "bool"
+    },
+    {
+      "name": "perfctr-nb",
+      "type": "bool"
+    },
+    {
+      "name": "rtm",
+      "type": "bool"
+    },
+    {
+      "name": "avx512-4fmaps",
+      "type": "bool"
+    },
+    {
+      "name": "avx2",
+      "type": "bool"
+    },
+    {
+      "name": "perfctr_nb",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-nopiodelay",
+      "type": "bool"
+    },
+    {
+      "name": "avx512pf",
+      "type": "bool"
+    },
+    {
+      "name": "level",
+      "type": "uint32"
+    },
+    {
+      "name": "phys-bits",
+      "type": "uint32"
+    },
+    {
+      "name": "cpuid-0xb",
+      "type": "bool"
+    },
+    {
+      "name": "tsc-deadline",
+      "type": "bool"
+    },
+    {
+      "name": "fxsr_opt",
+      "type": "bool"
+    },
+    {
+      "name": "xgetbv1",
+      "type": "bool"
+    },
+    {
+      "name": "popcnt",
+      "type": "bool"
+    },
+    {
+      "name": "umip",
+      "type": "bool"
+    },
+    {
+      "name": "realized",
+      "type": "bool"
+    },
+    {
+      "name": "phe",
+      "type": "bool"
+    },
+    {
+      "name": "cmp-legacy",
+      "type": "bool"
+    },
+    {
+      "name": "dca",
+      "type": "bool"
+    },
+    {
+      "name": "acpi",
+      "type": "bool"
+    },
+    {
+      "name": "pn",
+      "type": "bool"
+    },
+    {
+      "name": "model-id",
+      "type": "string"
+    },
+    {
+      "name": "crash-information",
+      "type": "GuestPanicInformation"
+    },
+    {
+      "name": "tsc-scale",
+      "type": "bool"
+    },
+    {
+      "name": "node-id",
+      "type": "int32"
+    },
+    {
+      "name": "hv-reenlightenment",
+      "type": "bool"
+    },
+    {
+      "name": "cx16",
+      "type": "bool"
+    },
+    {
+      "name": "mmx",
+      "type": "bool"
+    },
+    {
+      "name": "topoext",
+      "type": "bool"
+    },
+    {
+      "name": "pge",
+      "type": "bool"
+    },
+    {
+      "name": "fsgsbase",
+      "type": "bool"
+    },
+    {
+      "name": "pclmuldq",
+      "type": "bool"
+    },
+    {
+      "name": "misalignsse",
+      "type": "bool"
+    },
+    {
+      "name": "phe-en",
+      "type": "bool"
+    },
+    {
+      "name": "fma",
+      "type": "bool"
+    }
+  ],
+  "id": "libvirt-43"
+}
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-44"
+}
+
 {
   "return": [
     {
@@ -5333,12 +6395,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -5775,12 +6837,12 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
   "execute": "query-tpm-models",
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -5788,12 +6850,12 @@
     "tpm-crb",
     "tpm-tis"
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
   "execute": "query-tpm-types",
-  "id": "libvirt-46"
+  "id": "libvirt-47"
 }
 
 {
@@ -5801,12 +6863,12 @@
     "passthrough",
     "emulator"
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-47"
 }
 
 {
   "execute": "query-command-line-options",
-  "id": "libvirt-47"
+  "id": "libvirt-48"
 }
 
 {
@@ -7105,12 +8167,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-48"
 }
 
 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-48"
+  "id": "libvirt-49"
 }
 
 {
@@ -7180,12 +8242,12 @@
       "capability": "late-block-activate"
     }
   ],
-  "id": "libvirt-48"
+  "id": "libvirt-49"
 }
 
 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-49"
+  "id": "libvirt-50"
 }
 
 {
@@ -19425,7 +20487,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-49"
+  "id": "libvirt-50"
 }
 
 {
@@ -19436,7 +20498,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-51"
 }
 
 {
@@ -19629,7 +20691,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-51"
 }
 
 {
@@ -19824,7 +20886,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -20086,7 +21148,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -20100,7 +21162,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
@@ -20293,7 +21355,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
@@ -20488,7 +21550,7 @@
       }
     }
   },
-  "id": "libvirt-53"
+  "id": "libvirt-54"
 }
 
 {
@@ -20750,16 +21812,16 @@
       }
     }
   },
-  "id": "libvirt-53"
-}
-
-{
-  "execute": "query-sev-capabilities",
   "id": "libvirt-54"
 }
 
 {
-  "id": "libvirt-54",
+  "execute": "query-sev-capabilities",
+  "id": "libvirt-55"
+}
+
+{
+  "id": "libvirt-55",
   "error": {
     "class": "GenericError",
     "desc": "SEV feature is not available"
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index dceb719fcf..22dc60d13e 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -218,7 +218,7 @@
   <flag name='x86-max-cpu'/>
   <version>2012090</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>438109</microcodeVersion>
+  <microcodeVersion>453907</microcodeVersion>
   <package>v3.0.0-rc0-31-g633e824037</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
index ab0ac1e7bf..82b320b1d0 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
@@ -5510,10 +5510,1144 @@
 }
 
 {
-  "execute": "query-machines",
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "max-x86_64-cpu"
+  },
   "id": "libvirt-43"
 }
 
+{
+  "return": [
+    {
+      "name": "type",
+      "type": "string"
+    },
+    {
+      "name": "min-xlevel2",
+      "type": "uint32"
+    },
+    {
+      "name": "amd-ssbd",
+      "type": "bool"
+    },
+    {
+      "name": "vendor",
+      "type": "string"
+    },
+    {
+      "name": "gfni",
+      "type": "bool"
+    },
+    {
+      "name": "clwb",
+      "type": "bool"
+    },
+    {
+      "name": "nx",
+      "type": "bool"
+    },
+    {
+      "name": "x2apic",
+      "type": "bool"
+    },
+    {
+      "name": "mds-no",
+      "type": "bool"
+    },
+    {
+      "name": "kvmclock-stable-bit",
+      "type": "bool"
+    },
+    {
+      "name": "vmcb_clean",
+      "type": "bool"
+    },
+    {
+      "name": "min-level",
+      "type": "uint32"
+    },
+    {
+      "name": "fxsr-opt",
+      "type": "bool"
+    },
+    {
+      "name": "skinit",
+      "type": "bool"
+    },
+    {
+      "name": "avx",
+      "type": "bool"
+    },
+    {
+      "name": "unavailable-features",
+      "type": "strList"
+    },
+    {
+      "name": "3dnowext",
+      "type": "bool"
+    },
+    {
+      "name": "nodeid_msr",
+      "type": "bool"
+    },
+    {
+      "name": "hv-crash",
+      "type": "bool"
+    },
+    {
+      "name": "hypervisor",
+      "type": "bool"
+    },
+    {
+      "name": "enforce",
+      "type": "bool"
+    },
+    {
+      "name": "stepping",
+      "type": "int"
+    },
+    {
+      "name": "sse4_2",
+      "type": "bool"
+    },
+    {
+      "name": "sse4_1",
+      "type": "bool"
+    },
+    {
+      "name": "x-hv-max-vps",
+      "type": "int32"
+    },
+    {
+      "name": "hv-frequencies",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-hint-dedicated",
+      "type": "bool"
+    },
+    {
+      "name": "cmp_legacy",
+      "type": "bool"
+    },
+    {
+      "name": "tm2",
+      "type": "bool"
+    },
+    {
+      "name": "smx",
+      "type": "bool"
+    },
+    {
+      "name": "host-cache-info",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-pv-ipi",
+      "type": "bool"
+    },
+    {
+      "name": "hv-vendor-id",
+      "type": "str"
+    },
+    {
+      "name": "movbe",
+      "type": "bool"
+    },
+    {
+      "name": "3dnowprefetch",
+      "type": "bool"
+    },
+    {
+      "name": "mtrr",
+      "type": "bool"
+    },
+    {
+      "name": "wdt",
+      "type": "bool"
+    },
+    {
+      "name": "thread-id",
+      "type": "int32"
+    },
+    {
+      "name": "aes",
+      "type": "bool"
+    },
+    {
+      "name": "apic-id",
+      "type": "uint32"
+    },
+    {
+      "name": "lm",
+      "type": "bool"
+    },
+    {
+      "name": "family",
+      "type": "int"
+    },
+    {
+      "name": "tsc-adjust",
+      "type": "bool"
+    },
+    {
+      "name": "pfthreshold",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-no-smi-migration",
+      "type": "bool"
+    },
+    {
+      "name": "amd-no-ssb",
+      "type": "bool"
+    },
+    {
+      "name": "pse",
+      "type": "bool"
+    },
+    {
+      "name": "filtered-features",
+      "type": "X86CPUFeatureWordInfo"
+    },
+    {
+      "name": "hv-evmcs",
+      "type": "bool"
+    },
+    {
+      "name": "hv-vpindex",
+      "type": "bool"
+    },
+    {
+      "name": "i64",
+      "type": "bool"
+    },
+    {
+      "name": "avx512bitalg",
+      "type": "bool"
+    },
+    {
+      "name": "adx",
+      "type": "bool"
+    },
+    {
+      "name": "vaes",
+      "type": "bool"
+    },
+    {
+      "name": "ia64",
+      "type": "bool"
+    },
+    {
+      "name": "nodeid-msr",
+      "type": "bool"
+    },
+    {
+      "name": "ibpb",
+      "type": "bool"
+    },
+    {
+      "name": "hv-synic",
+      "type": "bool"
+    },
+    {
+      "name": "ibs",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_mmu",
+      "type": "bool"
+    },
+    {
+      "name": "tcg-cpuid",
+      "type": "bool"
+    },
+    {
+      "name": "nrip_save",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_nopiodelay",
+      "type": "bool"
+    },
+    {
+      "name": "lbrv",
+      "type": "bool"
+    },
+    {
+      "name": "rdtscp",
+      "type": "bool"
+    },
+    {
+      "name": "memory",
+      "type": "link<qemu:memory-region>"
+    },
+    {
+      "name": "avx512vbmi2",
+      "type": "bool"
+    },
+    {
+      "name": "ace2-en",
+      "type": "bool"
+    },
+    {
+      "name": "invtsc",
+      "type": "bool"
+    },
+    {
+      "name": "sse4.2",
+      "type": "bool"
+    },
+    {
+      "name": "sse4.1",
+      "type": "bool"
+    },
+    {
+      "name": "pbe",
+      "type": "bool"
+    },
+    {
+      "name": "rdrand",
+      "type": "bool"
+    },
+    {
+      "name": "socket-id",
+      "type": "int32"
+    },
+    {
+      "name": "hotpluggable",
+      "type": "bool"
+    },
+    {
+      "name": "l3-cache",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-steal-time",
+      "type": "bool"
+    },
+    {
+      "name": "vmware-cpuid-freq",
+      "type": "bool"
+    },
+    {
+      "name": "legacy-cache",
+      "type": "bool"
+    },
+    {
+      "name": "xop",
+      "type": "bool"
+    },
+    {
+      "name": "tsc-frequency",
+      "type": "int"
+    },
+    {
+      "name": "fill-mtrr-mask",
+      "type": "bool"
+    },
+    {
+      "name": "core-id",
+      "type": "int32"
+    },
+    {
+      "name": "intel-pt",
+      "type": "bool"
+    },
+    {
+      "name": "pat",
+      "type": "bool"
+    },
+    {
+      "name": "pcid",
+      "type": "bool"
+    },
+    {
+      "name": "rsba",
+      "type": "bool"
+    },
+    {
+      "name": "sse4-2",
+      "type": "bool"
+    },
+    {
+      "name": "sse4-1",
+      "type": "bool"
+    },
+    {
+      "name": "pclmulqdq",
+      "type": "bool"
+    },
+    {
+      "name": "sha-ni",
+      "type": "bool"
+    },
+    {
+      "name": "cmov",
+      "type": "bool"
+    },
+    {
+      "name": "pae",
+      "type": "bool"
+    },
+    {
+      "name": "smep",
+      "type": "bool"
+    },
+    {
+      "name": "arch-capabilities",
+      "type": "bool"
+    },
+    {
+      "name": "virt-ssbd",
+      "type": "bool"
+    },
+    {
+      "name": "abm",
+      "type": "bool"
+    },
+    {
+      "name": "xstore",
+      "type": "bool"
+    },
+    {
+      "name": "tsc_adjust",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-asyncpf",
+      "type": "bool"
+    },
+    {
+      "name": "pdpe1gb",
+      "type": "bool"
+    },
+    {
+      "name": "min-xlevel",
+      "type": "uint32"
+    },
+    {
+      "name": "kvm-mmu",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-pv-unhalt",
+      "type": "bool"
+    },
+    {
+      "name": "avx512f",
+      "type": "bool"
+    },
+    {
+      "name": "avx512vbmi",
+      "type": "bool"
+    },
+    {
+      "name": "xd",
+      "type": "bool"
+    },
+    {
+      "name": "avx512-4vnniw",
+      "type": "bool"
+    },
+    {
+      "name": "mmxext",
+      "type": "bool"
+    },
+    {
+      "name": "decodeassists",
+      "type": "bool"
+    },
+    {
+      "name": "ht",
+      "type": "bool"
+    },
+    {
+      "name": "xsave",
+      "type": "bool"
+    },
+    {
+      "name": "perfctr_core",
+      "type": "bool"
+    },
+    {
+      "name": "feature-words",
+      "type": "X86CPUFeatureWordInfo"
+    },
+    {
+      "name": "migratable",
+      "type": "bool"
+    },
+    {
+      "name": "3dnow",
+      "type": "bool"
+    },
+    {
+      "name": "spec-ctrl",
+      "type": "bool"
+    },
+    {
+      "name": "model",
+      "type": "int"
+    },
+    {
+      "name": "nrip-save",
+      "type": "bool"
+    },
+    {
+      "name": "lwp",
+      "type": "bool"
+    },
+    {
+      "name": "xstore-en",
+      "type": "bool"
+    },
+    {
+      "name": "avx512vl",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_pv_unhalt",
+      "type": "bool"
+    },
+    {
+      "name": "bmi2",
+      "type": "bool"
+    },
+    {
+      "name": "bmi1",
+      "type": "bool"
+    },
+    {
+      "name": "la57",
+      "type": "bool"
+    },
+    {
+      "name": "ffxsr",
+      "type": "bool"
+    },
+    {
+      "name": "stibp",
+      "type": "bool"
+    },
+    {
+      "name": "vmcb-clean",
+      "type": "bool"
+    },
+    {
+      "name": "wbnoinvd",
+      "type": "bool"
+    },
+    {
+      "name": "pause-filter",
+      "type": "bool"
+    },
+    {
+      "name": "pni",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_steal_time",
+      "type": "bool"
+    },
+    {
+      "name": "rdctl-no",
+      "type": "bool"
+    },
+    {
+      "name": "svm_lock",
+      "type": "bool"
+    },
+    {
+      "name": "ibrs-all",
+      "type": "bool"
+    },
+    {
+      "name": "pse36",
+      "type": "bool"
+    },
+    {
+      "name": "hv-stimer",
+      "type": "bool"
+    },
+    {
+      "name": "host-phys-bits",
+      "type": "bool"
+    },
+    {
+      "name": "extapic",
+      "type": "bool"
+    },
+    {
+      "name": "skip-l1dfl-vmentry",
+      "type": "bool"
+    },
+    {
+      "name": "hv-spinlocks",
+      "type": "int"
+    },
+    {
+      "name": "pmu",
+      "type": "bool"
+    },
+    {
+      "name": "pmm",
+      "type": "bool"
+    },
+    {
+      "name": "vpclmulqdq",
+      "type": "bool"
+    },
+    {
+      "name": "avx512-vpopcntdq",
+      "type": "bool"
+    },
+    {
+      "name": "avx512er",
+      "type": "bool"
+    },
+    {
+      "name": "pdcm",
+      "type": "bool"
+    },
+    {
+      "name": "svm",
+      "type": "bool"
+    },
+    {
+      "name": "apic",
+      "type": "bool"
+    },
+    {
+      "name": "xcrypt-en",
+      "type": "bool"
+    },
+    {
+      "name": "cr8legacy",
+      "type": "bool"
+    },
+    {
+      "name": "fma4",
+      "type": "bool"
+    },
+    {
+      "name": "host-phys-bits-limit",
+      "type": "uint8"
+    },
+    {
+      "name": "erms",
+      "type": "bool"
+    },
+    {
+      "name": "msr",
+      "type": "bool"
+    },
+    {
+      "name": "ds_cpl",
+      "type": "bool"
+    },
+    {
+      "name": "xlevel",
+      "type": "uint32"
+    },
+    {
+      "name": "xsaves",
+      "type": "bool"
+    },
+    {
+      "name": "hotplugged",
+      "type": "bool"
+    },
+    {
+      "name": "hv-relaxed",
+      "type": "bool"
+    },
+    {
+      "name": "pause_filter",
+      "type": "bool"
+    },
+    {
+      "name": "cldemote",
+      "type": "bool"
+    },
+    {
+      "name": "perfctr-core",
+      "type": "bool"
+    },
+    {
+      "name": "hv-ipi",
+      "type": "bool"
+    },
+    {
+      "name": "smap",
+      "type": "bool"
+    },
+    {
+      "name": "sse3",
+      "type": "bool"
+    },
+    {
+      "name": "avx512dq",
+      "type": "bool"
+    },
+    {
+      "name": "ssse3",
+      "type": "bool"
+    },
+    {
+      "name": "pmm-en",
+      "type": "bool"
+    },
+    {
+      "name": "npt",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-pv-tlb-flush",
+      "type": "bool"
+    },
+    {
+      "name": "tsc",
+      "type": "bool"
+    },
+    {
+      "name": "monitor",
+      "type": "bool"
+    },
+    {
+      "name": "f16c",
+      "type": "bool"
+    },
+    {
+      "name": "sse2",
+      "type": "bool"
+    },
+    {
+      "name": "rdpid",
+      "type": "bool"
+    },
+    {
+      "name": "mce",
+      "type": "bool"
+    },
+    {
+      "name": "full-cpuid-auto-level",
+      "type": "bool"
+    },
+    {
+      "name": "xtpr",
+      "type": "bool"
+    },
+    {
+      "name": "mca",
+      "type": "bool"
+    },
+    {
+      "name": "cid",
+      "type": "bool"
+    },
+    {
+      "name": "tm",
+      "type": "bool"
+    },
+    {
+      "name": "sep",
+      "type": "bool"
+    },
+    {
+      "name": "avx512vnni",
+      "type": "bool"
+    },
+    {
+      "name": "ds",
+      "type": "bool"
+    },
+    {
+      "name": "pku",
+      "type": "bool"
+    },
+    {
+      "name": "tce",
+      "type": "bool"
+    },
+    {
+      "name": "sse4a",
+      "type": "bool"
+    },
+    {
+      "name": "kvmclock",
+      "type": "bool"
+    },
+    {
+      "name": "lahf-lm",
+      "type": "bool"
+    },
+    {
+      "name": "clflushopt",
+      "type": "bool"
+    },
+    {
+      "name": "kvm",
+      "type": "bool"
+    },
+    {
+      "name": "ss",
+      "type": "bool"
+    },
+    {
+      "name": "flushbyasid",
+      "type": "bool"
+    },
+    {
+      "name": "hv-tlbflush",
+      "type": "bool"
+    },
+    {
+      "name": "lahf_lm",
+      "type": "bool"
+    },
+    {
+      "name": "de",
+      "type": "bool"
+    },
+    {
+      "name": "xsavec",
+      "type": "bool"
+    },
+    {
+      "name": "est",
+      "type": "bool"
+    },
+    {
+      "name": "check",
+      "type": "bool"
+    },
+    {
+      "name": "movdir64b",
+      "type": "bool"
+    },
+    {
+      "name": "dtes64",
+      "type": "bool"
+    },
+    {
+      "name": "md-clear",
+      "type": "bool"
+    },
+    {
+      "name": "vmx",
+      "type": "bool"
+    },
+    {
+      "name": "svm-lock",
+      "type": "bool"
+    },
+    {
+      "name": "avx512ifma",
+      "type": "bool"
+    },
+    {
+      "name": "clflush",
+      "type": "bool"
+    },
+    {
+      "name": "rdseed",
+      "type": "bool"
+    },
+    {
+      "name": "avx512cd",
+      "type": "bool"
+    },
+    {
+      "name": "xsaveopt",
+      "type": "bool"
+    },
+    {
+      "name": "tbm",
+      "type": "bool"
+    },
+    {
+      "name": "ace2",
+      "type": "bool"
+    },
+    {
+      "name": "vme",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_asyncpf",
+      "type": "bool"
+    },
+    {
+      "name": "hv-vapic",
+      "type": "bool"
+    },
+    {
+      "name": "parent_bus",
+      "type": "link<bus>"
+    },
+    {
+      "name": "lmce",
+      "type": "bool"
+    },
+    {
+      "name": "x-migrate-smi-count",
+      "type": "bool"
+    },
+    {
+      "name": "hv-reset",
+      "type": "bool"
+    },
+    {
+      "name": "hv-runtime",
+      "type": "bool"
+    },
+    {
+      "name": "ssbd",
+      "type": "bool"
+    },
+    {
+      "name": "avx512bw",
+      "type": "bool"
+    },
+    {
+      "name": "xcrypt",
+      "type": "bool"
+    },
+    {
+      "name": "fpu",
+      "type": "bool"
+    },
+    {
+      "name": "arat",
+      "type": "bool"
+    },
+    {
+      "name": "fxsr",
+      "type": "bool"
+    },
+    {
+      "name": "ds-cpl",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-pv-eoi",
+      "type": "bool"
+    },
+    {
+      "name": "hle",
+      "type": "bool"
+    },
+    {
+      "name": "mpx",
+      "type": "bool"
+    },
+    {
+      "name": "invpcid",
+      "type": "bool"
+    },
+    {
+      "name": "cx8",
+      "type": "bool"
+    },
+    {
+      "name": "pcommit",
+      "type": "bool"
+    },
+    {
+      "name": "sse",
+      "type": "bool"
+    },
+    {
+      "name": "syscall",
+      "type": "bool"
+    },
+    {
+      "name": "tsc_scale",
+      "type": "bool"
+    },
+    {
+      "name": "movdiri",
+      "type": "bool"
+    },
+    {
+      "name": "ssb-no",
+      "type": "bool"
+    },
+    {
+      "name": "xlevel2",
+      "type": "uint32"
+    },
+    {
+      "name": "hv-time",
+      "type": "bool"
+    },
+    {
+      "name": "kvm_pv_eoi",
+      "type": "bool"
+    },
+    {
+      "name": "osvw",
+      "type": "bool"
+    },
+    {
+      "name": "perfctr-nb",
+      "type": "bool"
+    },
+    {
+      "name": "rtm",
+      "type": "bool"
+    },
+    {
+      "name": "avx512-4fmaps",
+      "type": "bool"
+    },
+    {
+      "name": "avx2",
+      "type": "bool"
+    },
+    {
+      "name": "perfctr_nb",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-nopiodelay",
+      "type": "bool"
+    },
+    {
+      "name": "avx512pf",
+      "type": "bool"
+    },
+    {
+      "name": "level",
+      "type": "uint32"
+    },
+    {
+      "name": "phys-bits",
+      "type": "uint32"
+    },
+    {
+      "name": "cpuid-0xb",
+      "type": "bool"
+    },
+    {
+      "name": "tsc-deadline",
+      "type": "bool"
+    },
+    {
+      "name": "fxsr_opt",
+      "type": "bool"
+    },
+    {
+      "name": "xgetbv1",
+      "type": "bool"
+    },
+    {
+      "name": "popcnt",
+      "type": "bool"
+    },
+    {
+      "name": "umip",
+      "type": "bool"
+    },
+    {
+      "name": "realized",
+      "type": "bool"
+    },
+    {
+      "name": "phe",
+      "type": "bool"
+    },
+    {
+      "name": "cmp-legacy",
+      "type": "bool"
+    },
+    {
+      "name": "dca",
+      "type": "bool"
+    },
+    {
+      "name": "acpi",
+      "type": "bool"
+    },
+    {
+      "name": "pn",
+      "type": "bool"
+    },
+    {
+      "name": "model-id",
+      "type": "string"
+    },
+    {
+      "name": "crash-information",
+      "type": "GuestPanicInformation"
+    },
+    {
+      "name": "x-intel-pt-auto-level",
+      "type": "bool"
+    },
+    {
+      "name": "x-hv-synic-kvm-only",
+      "type": "bool"
+    },
+    {
+      "name": "tsc-scale",
+      "type": "bool"
+    },
+    {
+      "name": "node-id",
+      "type": "int32"
+    },
+    {
+      "name": "hv-reenlightenment",
+      "type": "bool"
+    },
+    {
+      "name": "cx16",
+      "type": "bool"
+    },
+    {
+      "name": "mmx",
+      "type": "bool"
+    },
+    {
+      "name": "topoext",
+      "type": "bool"
+    },
+    {
+      "name": "pge",
+      "type": "bool"
+    },
+    {
+      "name": "fsgsbase",
+      "type": "bool"
+    },
+    {
+      "name": "pclmuldq",
+      "type": "bool"
+    },
+    {
+      "name": "misalignsse",
+      "type": "bool"
+    },
+    {
+      "name": "phe-en",
+      "type": "bool"
+    },
+    {
+      "name": "fma",
+      "type": "bool"
+    }
+  ],
+  "id": "libvirt-43"
+}
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-44"
+}
+
 {
   "return": [
     {
@@ -5755,12 +6889,12 @@
       "alias": "q35"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -6310,12 +7444,12 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
   "execute": "query-tpm-models",
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
@@ -6323,12 +7457,12 @@
     "tpm-crb",
     "tpm-tis"
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
 
 {
   "execute": "query-tpm-types",
-  "id": "libvirt-46"
+  "id": "libvirt-47"
 }
 
 {
@@ -6336,12 +7470,12 @@
     "passthrough",
     "emulator"
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-47"
 }
 
 {
   "execute": "query-command-line-options",
-  "id": "libvirt-47"
+  "id": "libvirt-48"
 }
 
 {
@@ -7611,12 +8745,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-48"
 }
 
 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-48"
+  "id": "libvirt-49"
 }
 
 {
@@ -7690,12 +8824,12 @@
       "capability": "x-ignore-shared"
     }
   ],
-  "id": "libvirt-48"
+  "id": "libvirt-49"
 }
 
 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-49"
+  "id": "libvirt-50"
 }
 
 {
@@ -20178,7 +21312,7 @@
       ]
     }
   ],
-  "id": "libvirt-49"
+  "id": "libvirt-50"
 }
 
 {
@@ -20189,7 +21323,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-51"
 }
 
 {
@@ -20395,7 +21529,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-51"
 }
 
 {
@@ -20603,7 +21737,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -20884,7 +22018,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -20898,7 +22032,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
@@ -21104,7 +22238,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
@@ -21312,7 +22446,7 @@
       }
     }
   },
-  "id": "libvirt-53"
+  "id": "libvirt-54"
 }
 
 {
@@ -21593,16 +22727,16 @@
       }
     }
   },
-  "id": "libvirt-53"
-}
-
-{
-  "execute": "query-sev-capabilities",
   "id": "libvirt-54"
 }
 
 {
-  "id": "libvirt-54",
+  "execute": "query-sev-capabilities",
+  "id": "libvirt-55"
+}
+
+{
+  "id": "libvirt-55",
   "error": {
     "class": "GenericError",
     "desc": "SEV feature is not available"
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 4836dbb8a4..95d26dfce8 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -215,9 +215,10 @@
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
   <flag name='x86-max-cpu'/>
+  <flag name='cpu-unavailable-features'/>
   <version>4000050</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>456805</microcodeVersion>
+  <microcodeVersion>473743</microcodeVersion>
   <package>v4.0.0-1173-g9c70209b63</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
-- 
2.22.0