[PATCH v2 6/7] qemu_capabilities: Query for Hyper-V Enlightenments

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Now that we have qemuMonitorGetCPUModelExpansion() aware of
Hyper-V Enlightenments, we can start querying it. Two conditions
need to be met:

  1) KVM is in use,
  2) Arch is either x86 or arm.

It may look like modifying the first call to
qemuMonitorGetCPUModelExpansion() inside of
virQEMUCapsProbeQMPHostCPU() would be sufficient but it is not.
We really need to ask QEMU for full expansion and the first call
does not guarantee that.

For the test data, I've just copied whatever
'query-cpu-model-expansion' returned earlier, therefore there are
no hv-* props. But that's okay - the full expansion is not stored
in cache (and thus not formatted in
tests/qemucapabilitiesdata/caps_*.replies files either). This is
purely runtime thing.

Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
 src/qemu/qemu_capabilities.c                  | 159 ++++++
 .../caps_4.2.0.aarch64.replies                |  45 ++
 .../caps_4.2.0.aarch64.xml                    |   1 +
 .../caps_4.2.0.x86_64.replies                 | 317 ++++++++++++
 .../caps_4.2.0.x86_64.xml                     |   1 +
 .../caps_5.0.0.aarch64.replies                |  46 ++
 .../caps_5.0.0.aarch64.xml                    |   1 +
 .../caps_5.0.0.x86_64.replies                 | 318 ++++++++++++
 .../caps_5.0.0.x86_64.xml                     |   1 +
 .../caps_5.1.0.x86_64.replies                 | 323 ++++++++++++
 .../caps_5.1.0.x86_64.xml                     |   1 +
 .../caps_5.2.0.aarch64.replies                |  47 ++
 .../caps_5.2.0.aarch64.xml                    |   1 +
 .../caps_5.2.0.x86_64.replies                 | 324 +++++++++++++
 .../caps_5.2.0.x86_64.xml                     |   1 +
 .../caps_6.0.0.aarch64.replies                |  47 ++
 .../caps_6.0.0.aarch64.xml                    |   1 +
 .../caps_6.0.0.x86_64.replies                 | 336 +++++++++++++
 .../caps_6.0.0.x86_64.xml                     |   1 +
 .../caps_6.1.0.x86_64.replies                 | 338 +++++++++++++
 .../caps_6.1.0.x86_64.xml                     |   1 +
 .../caps_6.2.0.aarch64.replies                |  47 ++
 .../caps_6.2.0.aarch64.xml                    |   1 +
 .../caps_6.2.0.x86_64.replies                 | 348 +++++++++++++
 .../caps_6.2.0.x86_64.xml                     |   1 +
 .../caps_7.0.0.aarch64.replies                |  48 ++
 .../caps_7.0.0.aarch64.xml                    |   1 +
 .../caps_7.0.0.x86_64.replies                 | 352 ++++++++++++++
 .../caps_7.0.0.x86_64.xml                     |   1 +
 .../caps_7.1.0.x86_64.replies                 | 353 ++++++++++++++
 .../caps_7.1.0.x86_64.xml                     |   1 +
 .../caps_7.2.0.x86_64.replies                 | 353 ++++++++++++++
 .../caps_7.2.0.x86_64.xml                     |   1 +
 .../caps_8.0.0.x86_64.replies                 | 458 ++++++++++++++++++
 .../caps_8.0.0.x86_64.xml                     |  16 +
 35 files changed, 4291 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 4c75eea64e..93585f5af1 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -766,6 +766,8 @@ struct _virQEMUCaps {
 
     virSGXCapability *sgxCapabilities;
 
+    virDomainCapsFeatureHyperv *hypervCapabilities;
+
     /* Capabilities which may differ depending on the accelerator. */
     virQEMUCapsAccel kvm;
     virQEMUCapsAccel hvf;
@@ -2019,6 +2021,9 @@ virQEMUCaps *virQEMUCapsNewCopy(virQEMUCaps *qemuCaps)
                                qemuCaps->sgxCapabilities) < 0)
         return NULL;
 
+    ret->hypervCapabilities = g_memdup(qemuCaps->hypervCapabilities,
+                                       sizeof(virDomainCapsFeatureHyperv));
+
     return g_steal_pointer(&ret);
 }
 
@@ -2059,6 +2064,8 @@ void virQEMUCapsDispose(void *obj)
     virSEVCapabilitiesFree(qemuCaps->sevCapabilities);
     virSGXCapabilitiesFree(qemuCaps->sgxCapabilities);
 
+    g_free(qemuCaps->hypervCapabilities);
+
     virQEMUCapsAccelClear(&qemuCaps->kvm);
     virQEMUCapsAccelClear(&qemuCaps->hvf);
     virQEMUCapsAccelClear(&qemuCaps->tcg);
@@ -3029,6 +3036,66 @@ virQEMUCapsProbeCPUDefinitionsTest(virQEMUCaps *qemuCaps,
 }
 
 
+static int
+virQEMUCapsProbeHypervCapabilities(virQEMUCaps *qemuCaps,
+                                   qemuMonitorCPUModelInfo *fullQEMU)
+{
+    g_autofree virDomainCapsFeatureHyperv *hvcaps = NULL;
+    size_t i;
+
+    if (!fullQEMU)
+        return 0;
+
+    hvcaps = g_new0(virDomainCapsFeatureHyperv, 1);
+    hvcaps->features.report = true;
+
+    for (i = 0; i <fullQEMU->nprops; i++) {
+        qemuMonitorCPUProperty prop = fullQEMU->props[i];
+        const char *name;
+        int hvprop;
+
+        if (!(name = STRSKIP(prop.name, "hv-")))
+            continue;
+
+        hvprop = virDomainHypervTypeFromString(name);
+
+        if (hvprop < 0) {
+            /* Some names are different. For instance QEMU reports hv-vendor-id
+             * but we have it as vendor_id (because of XML). Replace hyphens
+             * with underscores and try again. */
+            g_autofree char *underscoreName = NULL;
+
+            underscoreName = virStringReplace(name, "-", "_");
+
+            hvprop = virDomainHypervTypeFromString(underscoreName);
+            if (hvprop < 0) {
+                VIR_DEBUG("Not yet implement Hyper-V enlightenment: %s",
+                          prop.name);
+                continue;
+            }
+        }
+
+        if ((prop.type == QEMU_MONITOR_CPU_PROPERTY_BOOLEAN &&
+             prop.value.boolean) ||
+            (prop.type == QEMU_MONITOR_CPU_PROPERTY_NUMBER &&
+             prop.value.number > 0) ||
+            (prop.type == QEMU_MONITOR_CPU_PROPERTY_STRING &&
+             prop.value.string))
+            VIR_DOMAIN_CAPS_ENUM_SET(hvcaps->features, hvprop);
+
+    }
+
+    if (hvcaps->features.values) {
+        hvcaps->supported = VIR_TRISTATE_BOOL_YES;
+    } else {
+        hvcaps->supported = VIR_TRISTATE_BOOL_NO;
+    }
+
+    qemuCaps->hypervCapabilities = g_steal_pointer(&hvcaps);
+    return 0;
+}
+
+
 static int
 virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps,
                            virQEMUCapsAccel *accel,
@@ -3110,6 +3177,18 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps,
         modelInfo->migratability = true;
     }
 
+    if (virQEMUCapsTypeIsAccelerated(virtType) &&
+        (ARCH_IS_X86(qemuCaps->arch) || ARCH_IS_ARM(qemuCaps->arch))) {
+        g_autoptr(qemuMonitorCPUModelInfo) fullQEMU = NULL;
+
+        if (qemuMonitorGetCPUModelExpansion(mon, QEMU_MONITOR_CPU_MODEL_EXPANSION_FULL,
+                                            cpu, false, true, true, &fullQEMU) < 0)
+            return -1;
+
+        if (virQEMUCapsProbeHypervCapabilities(qemuCaps, fullQEMU) < 0)
+            return -1;
+    }
+
     accel->hostCPU.info = g_steal_pointer(&modelInfo);
     return 0;
 }
@@ -4337,6 +4416,53 @@ virQEMUCapsParseSGXInfo(virQEMUCaps *qemuCaps,
 }
 
 
+static int
+virQEMUCapsParseHypervCapabilities(virQEMUCaps *qemuCaps,
+                                   xmlXPathContextPtr ctxt)
+{
+    g_autofree virDomainCapsFeatureHyperv *hvcaps = NULL;
+    xmlNodePtr n = NULL;
+    g_autofree xmlNodePtr *capNodes = NULL;
+    int ncapNodes;
+    size_t i;
+
+    if (!(n = virXPathNode("./hypervCapabilities", ctxt)))
+        return 0;
+
+    hvcaps = g_new0(virDomainCapsFeatureHyperv, 1);
+    if (virXMLPropTristateBool(n, "supported", VIR_XML_PROP_REQUIRED,
+                               &hvcaps->supported) < 0) {
+        return -1;
+    }
+
+    if ((ncapNodes = virXPathNodeSet("./hypervCapabilities/cap",
+                                     ctxt, &capNodes)) < 0) {
+        return -1;
+    }
+
+    hvcaps->features.report = ncapNodes > 0;
+    for (i = 0; i < ncapNodes; i++) {
+        g_autofree char *name = virXMLPropStringRequired(capNodes[i], "name");
+        int val;
+
+        if (!name)
+            return -1;
+
+        if ((val = virDomainHypervTypeFromString(name)) < 0) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("unsupported HyperV Enlightenment feature: %s"),
+                           name);
+            return -1;
+        }
+
+        VIR_DOMAIN_CAPS_ENUM_SET(hvcaps->features, val);
+    }
+
+    qemuCaps->hypervCapabilities = g_steal_pointer(&hvcaps);
+    return 0;
+}
+
+
 static int
 virQEMUCapsParseFlags(virQEMUCaps *qemuCaps, xmlXPathContextPtr ctxt)
 {
@@ -4628,6 +4754,9 @@ virQEMUCapsLoadCache(virArch hostArch,
     if (virQEMUCapsParseSGXInfo(qemuCaps, ctxt) < 0)
         return -1;
 
+    if (virQEMUCapsParseHypervCapabilities(qemuCaps, ctxt) < 0)
+        return -1;
+
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM))
         virQEMUCapsInitHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_KVM);
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_HVF))
@@ -4848,6 +4977,33 @@ virQEMUCapsFormatSGXInfo(virQEMUCaps *qemuCaps,
 }
 
 
+static void
+virQEMUCapsFormatHypervCapabilities(virQEMUCaps *qemuCaps,
+                                    virBuffer *buf)
+{
+    virDomainCapsFeatureHyperv *hvcaps = qemuCaps->hypervCapabilities;
+    virBuffer attrBuf = VIR_BUFFER_INITIALIZER;
+    virBuffer childBuf = VIR_BUFFER_INIT_CHILD(buf);
+
+    virBufferAsprintf(&attrBuf, " supported='%s'",
+                      virTristateBoolTypeToString(hvcaps->supported));
+
+    if (hvcaps->supported) {
+        size_t i;
+
+        for (i = 0; i < sizeof(hvcaps->features.values) * CHAR_BIT; i++) {
+            if (!(hvcaps->features.values & (1U << i)))
+                continue;
+
+            virBufferAsprintf(&childBuf, "<cap name='%s'/>\n",
+                              virDomainHypervTypeToString(i));
+        }
+    }
+
+    return virXMLFormatElement(buf, "hypervCapabilities", &attrBuf, &childBuf);
+}
+
+
 char *
 virQEMUCapsFormatCache(virQEMUCaps *qemuCaps)
 {
@@ -4932,6 +5088,9 @@ virQEMUCapsFormatCache(virQEMUCaps *qemuCaps)
     if (qemuCaps->sgxCapabilities)
         virQEMUCapsFormatSGXInfo(qemuCaps, &buf);
 
+    if (qemuCaps->hypervCapabilities)
+        virQEMUCapsFormatHypervCapabilities(qemuCaps, &buf);
+
     if (qemuCaps->kvmSupportsNesting)
         virBufferAddLit(&buf, "<kvmSupportsNesting/>\n");
 
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
index f947ce9aee..f8619d8843 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
@@ -21525,6 +21525,51 @@
   "id": "libvirt-42"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-43"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "host",
+      "props": {
+        "sve768": false,
+        "sve128": true,
+        "sve1024": false,
+        "sve1280": false,
+        "sve896": false,
+        "sve256": true,
+        "sve1536": false,
+        "sve1792": false,
+        "sve384": false,
+        "sve": true,
+        "sve2048": false,
+        "sve512": true,
+        "aarch64": true,
+        "pmu": true,
+        "sve1920": false,
+        "sve1152": false,
+        "sve640": false,
+        "sve1408": false,
+        "sve1664": false
+      }
+    }
+  },
+  "id": "libvirt-43"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 1f42ff6cf9..22bf577a7d 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -379,4 +379,5 @@
   <machine type='tcg' name='lm3s811evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
   <gic version='3' kernel='yes' emulated='yes'/>
   <gic version='2' kernel='no' emulated='yes'/>
+  <hypervCapabilities supported='no'/>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
index 12ebc41e49..a45fd2f669 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
@@ -24185,6 +24185,323 @@
   "id": "libvirt-47"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-48"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "base",
+      "props": {
+        "vmx-entry-load-rtit-ctl": false,
+        "cmov": true,
+        "ia64": false,
+        "ssb-no": false,
+        "aes": true,
+        "vmx-apicv-xapic": true,
+        "mmx": true,
+        "rdpid": false,
+        "arat": true,
+        "vmx-page-walk-4": true,
+        "vmx-page-walk-5": false,
+        "gfni": false,
+        "ibrs-all": false,
+        "vmx-desc-exit": true,
+        "pause-filter": false,
+        "xsavec": true,
+        "intel-pt": false,
+        "vmx-cr8-store-exit": true,
+        "vmx-rdseed-exit": true,
+        "vmx-eptp-switching": true,
+        "kvm-asyncpf": true,
+        "perfctr-core": false,
+        "mpx": true,
+        "pbe": false,
+        "avx512cd": false,
+        "decodeassists": false,
+        "vmx-exit-load-efer": true,
+        "vmx-exit-clear-bndcfgs": false,
+        "sse4.1": true,
+        "family": 6,
+        "vmx-vmwrite-vmexit-fields": true,
+        "vmx-vnmi": true,
+        "vmx-true-ctls": true,
+        "vmx-ept-execonly": true,
+        "vmx-exit-save-efer": true,
+        "vmx-invept-all-context": true,
+        "wbnoinvd": false,
+        "avx512f": false,
+        "msr": true,
+        "mce": true,
+        "mca": true,
+        "xcrypt": false,
+        "vmx-exit-load-pat": true,
+        "vmx-intr-exit": true,
+        "min-level": 22,
+        "vmx-flexpriority": true,
+        "xgetbv1": true,
+        "cid": false,
+        "ds": false,
+        "fxsr": true,
+        "avx512-bf16": false,
+        "vmx-cr8-load-exit": true,
+        "xsaveopt": true,
+        "vmx-apicv-vid": false,
+        "vmx-exit-save-pat": true,
+        "xtpr": false,
+        "tsx-ctrl": false,
+        "vmx-ple": false,
+        "avx512vl": false,
+        "avx512-vpopcntdq": false,
+        "phe": false,
+        "extapic": false,
+        "3dnowprefetch": true,
+        "vmx-vmfunc": true,
+        "vmx-activity-shutdown": false,
+        "avx512vbmi2": false,
+        "cr8legacy": false,
+        "vmx-encls-exit": false,
+        "stibp": true,
+        "vmx-msr-bitmap": true,
+        "xcrypt-en": false,
+        "vmx-mwait-exit": true,
+        "vmx-pml": true,
+        "vmx-nmi-exit": true,
+        "vmx-invept-single-context-noglobals": true,
+        "pn": false,
+        "rsba": false,
+        "dca": false,
+        "vendor": "GenuineIntel",
+        "vmx-unrestricted-guest": true,
+        "vmx-cr3-store-noexit": true,
+        "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,
+        "vmx-invvpid": true,
+        "clwb": false,
+        "lbrv": false,
+        "adx": true,
+        "ss": true,
+        "pni": true,
+        "svm-lock": false,
+        "smep": true,
+        "smap": true,
+        "pfthreshold": false,
+        "vmx-invpcid-exit": true,
+        "x2apic": true,
+        "avx512vbmi": false,
+        "avx512vnni": false,
+        "vmx-apicv-x2apic": true,
+        "kvm-pv-sched-yield": true,
+        "vmx-invlpg-exit": true,
+        "vmx-invvpid-all-context": true,
+        "vmx-activity-hlt": true,
+        "flushbyasid": false,
+        "f16c": true,
+        "vmx-exit-ack-intr": true,
+        "ace2-en": false,
+        "pae": true,
+        "pat": true,
+        "sse": true,
+        "phe-en": false,
+        "vmx-tsc-offset": true,
+        "kvm-nopiodelay": true,
+        "tm": false,
+        "kvmclock-stable-bit": true,
+        "vmx-rdtsc-exit": true,
+        "hypervisor": true,
+        "vmx-rdtscp-exit": true,
+        "mds-no": false,
+        "pcommit": false,
+        "vmx-vpid": true,
+        "syscall": true,
+        "avx512dq": false,
+        "svm": false,
+        "invtsc": true,
+        "vmx-monitor-exit": true,
+        "sse2": true,
+        "ssbd": true,
+        "vmx-wbinvd-exit": true,
+        "est": false,
+        "kvm-poll-control": true,
+        "avx512ifma": false,
+        "tm2": false,
+        "kvm-pv-eoi": true,
+        "kvm-pv-ipi": true,
+        "cx8": true,
+        "vmx-invvpid-single-addr": true,
+        "waitpkg": false,
+        "cldemote": false,
+        "vmx-ept": true,
+        "kvm-mmu": false,
+        "sse4.2": true,
+        "pge": true,
+        "avx512bitalg": false,
+        "pdcm": false,
+        "vmx-entry-load-bndcfgs": false,
+        "vmx-exit-clear-rtit-ctl": false,
+        "model": 94,
+        "movbe": true,
+        "nrip-save": false,
+        "ssse3": true,
+        "sse4a": false,
+        "vmx-pause-exit": true,
+        "invpcid": true,
+        "pdpe1gb": true,
+        "tsc-deadline": true,
+        "skip-l1dfl-vmentry": true,
+        "vmx-exit-load-perf-global-ctrl": false,
+        "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,
+        "vmx-exit-nosave-debugctl": true,
+        "la57": false,
+        "vmx-invept": true,
+        "osvw": false,
+        "apic": true,
+        "pmm": false,
+        "vmx-entry-noload-debugctl": true,
+        "vmx-eptad": true,
+        "spec-ctrl": true,
+        "vmx-posted-intr": false,
+        "vmx-apicv-register": false,
+        "tsc-adjust": true,
+        "kvm-steal-time": true,
+        "kvmclock": true,
+        "vmx-zero-len-inject": false,
+        "pschange-mc-no": true,
+        "vmx-rdrand-exit": true,
+        "lwp": false,
+        "amd-ssbd": false,
+        "xop": false,
+        "ibpb": false,
+        "avx": true,
+        "core-capability": false,
+        "vmx-invept-single-context": true,
+        "movdiri": false,
+        "acpi": false,
+        "avx512bw": false,
+        "ace2": false,
+        "fsgsbase": true,
+        "vmx-ept-2mb": true,
+        "vmx-ept-1gb": true,
+        "ht": false,
+        "vmx-io-exit": true,
+        "nx": true,
+        "pclmulqdq": true,
+        "mmxext": false,
+        "popcnt": true,
+        "vaes": false,
+        "movdir64b": false,
+        "xsaves": true,
+        "vmx-shadow-vmcs": true,
+        "lm": true,
+        "vmx-exit-save-preemption-timer": true,
+        "vmx-entry-load-pat": true,
+        "vmx-entry-load-perf-global-ctrl": false,
+        "vmx-io-bitmap": true,
+        "umip": true,
+        "vmx-store-lma": true,
+        "vmx-movdr-exit": true,
+        "pse": true,
+        "avx2": true,
+        "sep": true,
+        "virt-ssbd": false,
+        "vmx-cr3-load-noexit": true,
+        "nodeid-msr": false,
+        "md-clear": true,
+        "misalignsse": false,
+        "split-lock-detect": false,
+        "min-xlevel": 2147483656,
+        "bmi1": true,
+        "bmi2": true,
+        "kvm-pv-unhalt": true,
+        "tsc-scale": false,
+        "topoext": false,
+        "vmx-preemption-timer": true,
+        "clflushopt": true,
+        "vmx-vnmi-pending": true,
+        "monitor": false,
+        "vmx-vintr-pending": true,
+        "avx512er": false,
+        "pmm-en": false,
+        "pcid": true,
+        "taa-no": false,
+        "arch-capabilities": true,
+        "vmx-secondary-ctls": true,
+        "vmx-xsaves": true,
+        "clzero": false,
+        "3dnow": false,
+        "erms": true,
+        "vmx-entry-ia32e-mode": true,
+        "lahf-lm": true,
+        "vpclmulqdq": false,
+        "vmx-ins-outs": true,
+        "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,
+        "xsaveerptr": false,
+        "pse36": true,
+        "kvm-pv-tlb-flush": true,
+        "vmx-activity-wait-sipi": false,
+        "tbm": false,
+        "wdt": false,
+        "vmx-rdpmc-exit": true,
+        "vmx-mtf": true,
+        "vmx-entry-load-efer": true,
+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
+        "sha-ni": false,
+        "abm": true,
+        "vmx-ept-advanced-exitinfo": false,
+        "avx512pf": false,
+        "vmx-hlt-exit": true,
+        "xstore-en": false
+      }
+    }
+  },
+  "id": "libvirt-48"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 438927aad0..d716755e82 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -2538,4 +2538,5 @@
   <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
   <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
   <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
+  <hypervCapabilities supported='no'/>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
index 9f7d3da252..e63c9d5f0a 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
@@ -22879,6 +22879,52 @@
   "id": "libvirt-43"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-44"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "host",
+      "props": {
+        "sve768": false,
+        "sve128": false,
+        "sve1024": false,
+        "sve1280": false,
+        "sve896": false,
+        "sve256": false,
+        "sve1536": false,
+        "sve1792": false,
+        "sve384": false,
+        "sve": false,
+        "sve2048": false,
+        "kvm-no-adjvtime": false,
+        "sve512": false,
+        "aarch64": true,
+        "pmu": true,
+        "sve1920": false,
+        "sve1152": false,
+        "sve640": false,
+        "sve1408": false,
+        "sve1664": false
+      }
+    }
+  },
+  "id": "libvirt-44"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index ff989e0878..bfef83d4d4 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -403,4 +403,5 @@
   <machine type='tcg' name='terrier' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/>
   <gic version='3' kernel='yes' emulated='yes'/>
   <gic version='2' kernel='no' emulated='yes'/>
+  <hypervCapabilities supported='no'/>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
index 81cfc70dc4..13b9b02e4c 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
@@ -25639,6 +25639,324 @@
   "id": "libvirt-48"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-49"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "base",
+      "props": {
+        "vmx-entry-load-rtit-ctl": false,
+        "cmov": true,
+        "ia64": false,
+        "ssb-no": false,
+        "aes": true,
+        "vmx-apicv-xapic": true,
+        "mmx": true,
+        "rdpid": false,
+        "arat": true,
+        "vmx-page-walk-4": true,
+        "vmx-page-walk-5": false,
+        "gfni": false,
+        "ibrs-all": false,
+        "vmx-desc-exit": true,
+        "pause-filter": false,
+        "xsavec": true,
+        "intel-pt": false,
+        "vmx-cr8-store-exit": true,
+        "vmx-rdseed-exit": true,
+        "vmx-eptp-switching": true,
+        "kvm-asyncpf": true,
+        "perfctr-core": false,
+        "mpx": true,
+        "pbe": false,
+        "avx512cd": false,
+        "decodeassists": false,
+        "vmx-exit-load-efer": true,
+        "vmx-exit-clear-bndcfgs": false,
+        "sse4.1": true,
+        "family": 6,
+        "vmx-vmwrite-vmexit-fields": true,
+        "vmx-vnmi": true,
+        "vmx-true-ctls": true,
+        "vmx-ept-execonly": true,
+        "vmx-exit-save-efer": true,
+        "vmx-invept-all-context": true,
+        "wbnoinvd": false,
+        "avx512f": false,
+        "msr": true,
+        "mce": true,
+        "mca": true,
+        "xcrypt": false,
+        "vmx-exit-load-pat": true,
+        "vmx-intr-exit": true,
+        "min-level": 22,
+        "vmx-flexpriority": true,
+        "xgetbv1": true,
+        "cid": false,
+        "ds": false,
+        "fxsr": true,
+        "avx512-bf16": false,
+        "vmx-cr8-load-exit": true,
+        "xsaveopt": true,
+        "vmx-apicv-vid": false,
+        "vmx-exit-save-pat": true,
+        "xtpr": false,
+        "tsx-ctrl": false,
+        "vmx-ple": false,
+        "avx512vl": false,
+        "avx512-vpopcntdq": false,
+        "phe": false,
+        "extapic": false,
+        "3dnowprefetch": true,
+        "vmx-vmfunc": true,
+        "vmx-activity-shutdown": false,
+        "avx512vbmi2": false,
+        "cr8legacy": false,
+        "vmx-encls-exit": false,
+        "stibp": true,
+        "vmx-msr-bitmap": true,
+        "xcrypt-en": false,
+        "vmx-mwait-exit": true,
+        "vmx-pml": true,
+        "vmx-nmi-exit": true,
+        "vmx-invept-single-context-noglobals": true,
+        "pn": false,
+        "rsba": false,
+        "dca": false,
+        "vendor": "GenuineIntel",
+        "vmx-unrestricted-guest": true,
+        "vmx-cr3-store-noexit": true,
+        "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,
+        "vmx-invvpid": true,
+        "clwb": false,
+        "lbrv": false,
+        "adx": true,
+        "ss": true,
+        "pni": true,
+        "svm-lock": false,
+        "smep": true,
+        "smap": true,
+        "pfthreshold": false,
+        "vmx-invpcid-exit": true,
+        "x2apic": true,
+        "avx512vbmi": false,
+        "avx512vnni": false,
+        "vmx-apicv-x2apic": true,
+        "kvm-pv-sched-yield": true,
+        "vmx-invlpg-exit": true,
+        "vmx-invvpid-all-context": true,
+        "vmx-activity-hlt": true,
+        "flushbyasid": false,
+        "f16c": true,
+        "vmx-exit-ack-intr": true,
+        "ace2-en": false,
+        "pae": true,
+        "pat": true,
+        "sse": true,
+        "phe-en": false,
+        "vmx-tsc-offset": true,
+        "kvm-nopiodelay": true,
+        "tm": false,
+        "kvmclock-stable-bit": true,
+        "vmx-rdtsc-exit": true,
+        "hypervisor": true,
+        "vmx-rdtscp-exit": true,
+        "mds-no": false,
+        "pcommit": false,
+        "vmx-vpid": true,
+        "syscall": true,
+        "avx512dq": false,
+        "svm": false,
+        "invtsc": true,
+        "vmx-monitor-exit": true,
+        "sse2": true,
+        "ssbd": true,
+        "vmx-wbinvd-exit": true,
+        "est": false,
+        "kvm-poll-control": true,
+        "avx512ifma": false,
+        "tm2": false,
+        "kvm-pv-eoi": true,
+        "kvm-pv-ipi": true,
+        "cx8": true,
+        "vmx-invvpid-single-addr": true,
+        "waitpkg": false,
+        "cldemote": false,
+        "vmx-ept": true,
+        "kvm-mmu": false,
+        "sse4.2": true,
+        "pge": true,
+        "avx512bitalg": false,
+        "pdcm": false,
+        "vmx-entry-load-bndcfgs": false,
+        "vmx-exit-clear-rtit-ctl": false,
+        "model": 94,
+        "movbe": true,
+        "nrip-save": false,
+        "ssse3": true,
+        "sse4a": false,
+        "vmx-pause-exit": true,
+        "invpcid": true,
+        "pdpe1gb": true,
+        "tsc-deadline": true,
+        "skip-l1dfl-vmentry": true,
+        "vmx-exit-load-perf-global-ctrl": false,
+        "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,
+        "vmx-exit-nosave-debugctl": true,
+        "la57": false,
+        "vmx-invept": true,
+        "osvw": false,
+        "apic": true,
+        "pmm": false,
+        "vmx-entry-noload-debugctl": true,
+        "vmx-eptad": true,
+        "spec-ctrl": true,
+        "vmx-posted-intr": false,
+        "vmx-apicv-register": false,
+        "tsc-adjust": true,
+        "kvm-steal-time": true,
+        "kvmclock": true,
+        "vmx-zero-len-inject": false,
+        "pschange-mc-no": true,
+        "vmx-rdrand-exit": true,
+        "lwp": false,
+        "amd-ssbd": false,
+        "xop": false,
+        "ibpb": false,
+        "avx": true,
+        "core-capability": false,
+        "vmx-invept-single-context": true,
+        "movdiri": false,
+        "acpi": false,
+        "avx512bw": false,
+        "ace2": false,
+        "fsgsbase": true,
+        "vmx-ept-2mb": true,
+        "vmx-ept-1gb": true,
+        "ht": false,
+        "vmx-io-exit": true,
+        "nx": true,
+        "pclmulqdq": true,
+        "mmxext": false,
+        "popcnt": true,
+        "vaes": false,
+        "movdir64b": false,
+        "xsaves": true,
+        "vmx-shadow-vmcs": true,
+        "lm": true,
+        "vmx-exit-save-preemption-timer": true,
+        "vmx-entry-load-pat": true,
+        "vmx-entry-load-perf-global-ctrl": false,
+        "vmx-io-bitmap": true,
+        "umip": true,
+        "vmx-store-lma": true,
+        "vmx-movdr-exit": true,
+        "pse": true,
+        "avx2": true,
+        "sep": true,
+        "virt-ssbd": false,
+        "vmx-cr3-load-noexit": true,
+        "nodeid-msr": false,
+        "md-clear": true,
+        "misalignsse": false,
+        "split-lock-detect": false,
+        "min-xlevel": 2147483656,
+        "bmi1": true,
+        "bmi2": true,
+        "kvm-pv-unhalt": true,
+        "tsc-scale": false,
+        "topoext": false,
+        "amd-stibp": false,
+        "vmx-preemption-timer": true,
+        "clflushopt": true,
+        "vmx-vnmi-pending": true,
+        "monitor": false,
+        "vmx-vintr-pending": true,
+        "avx512er": false,
+        "pmm-en": false,
+        "pcid": true,
+        "taa-no": false,
+        "arch-capabilities": true,
+        "vmx-secondary-ctls": true,
+        "vmx-xsaves": true,
+        "clzero": false,
+        "3dnow": false,
+        "erms": true,
+        "vmx-entry-ia32e-mode": true,
+        "lahf-lm": true,
+        "vpclmulqdq": false,
+        "vmx-ins-outs": true,
+        "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,
+        "xsaveerptr": false,
+        "pse36": true,
+        "kvm-pv-tlb-flush": true,
+        "vmx-activity-wait-sipi": false,
+        "tbm": false,
+        "wdt": false,
+        "vmx-rdpmc-exit": true,
+        "vmx-mtf": true,
+        "vmx-entry-load-efer": true,
+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
+        "sha-ni": false,
+        "abm": true,
+        "vmx-ept-advanced-exitinfo": false,
+        "avx512pf": false,
+        "vmx-hlt-exit": true,
+        "xstore-en": false
+      }
+    }
+  },
+  "id": "libvirt-49"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index bf32de2ee4..a7417187f6 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -2843,4 +2843,5 @@
   <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
   <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
   <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
+  <hypervCapabilities supported='no'/>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
index 51e93819b0..d66583fa92 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
@@ -26601,6 +26601,329 @@
   "id": "libvirt-49"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-50"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "base",
+      "props": {
+        "vmx-entry-load-rtit-ctl": false,
+        "cmov": true,
+        "ia64": false,
+        "ssb-no": false,
+        "aes": true,
+        "vmx-apicv-xapic": false,
+        "mmx": true,
+        "rdpid": true,
+        "arat": true,
+        "vmx-page-walk-4": false,
+        "vmx-page-walk-5": false,
+        "gfni": false,
+        "ibrs-all": false,
+        "vmx-desc-exit": false,
+        "pause-filter": false,
+        "xsavec": true,
+        "intel-pt": false,
+        "vmx-cr8-store-exit": false,
+        "vmx-rdseed-exit": false,
+        "vmx-eptp-switching": false,
+        "kvm-asyncpf": true,
+        "perfctr-core": true,
+        "mpx": false,
+        "pbe": false,
+        "avx512cd": false,
+        "decodeassists": false,
+        "vmx-exit-load-efer": false,
+        "vmx-exit-clear-bndcfgs": false,
+        "sse4.1": true,
+        "family": 23,
+        "vmx-vmwrite-vmexit-fields": false,
+        "vmx-vnmi": false,
+        "vmx-true-ctls": false,
+        "vmx-ept-execonly": false,
+        "vmx-exit-save-efer": false,
+        "vmx-invept-all-context": false,
+        "wbnoinvd": true,
+        "avx512f": false,
+        "msr": true,
+        "mce": true,
+        "mca": true,
+        "xcrypt": false,
+        "vmx-exit-load-pat": false,
+        "vmx-intr-exit": false,
+        "min-level": 16,
+        "vmx-flexpriority": false,
+        "xgetbv1": true,
+        "cid": false,
+        "ds": false,
+        "fxsr": true,
+        "avx512-bf16": false,
+        "vmx-cr8-load-exit": false,
+        "xsaveopt": true,
+        "vmx-apicv-vid": false,
+        "vmx-exit-save-pat": false,
+        "xtpr": false,
+        "tsx-ctrl": false,
+        "vmx-ple": false,
+        "avx512vl": false,
+        "avx512-vpopcntdq": false,
+        "phe": false,
+        "extapic": false,
+        "3dnowprefetch": true,
+        "vmx-vmfunc": false,
+        "vmx-activity-shutdown": false,
+        "avx512vbmi2": false,
+        "cr8legacy": true,
+        "vmx-encls-exit": false,
+        "stibp": true,
+        "vmx-msr-bitmap": false,
+        "xcrypt-en": false,
+        "vmx-mwait-exit": false,
+        "vmx-pml": false,
+        "vmx-nmi-exit": false,
+        "vmx-invept-single-context-noglobals": false,
+        "pn": false,
+        "rsba": false,
+        "dca": false,
+        "vendor": "AuthenticAMD",
+        "vmx-unrestricted-guest": false,
+        "vmx-cr3-store-noexit": false,
+        "pku": false,
+        "smx": false,
+        "cmp-legacy": true,
+        "avx512-4fmaps": false,
+        "vmcb-clean": false,
+        "hle": false,
+        "3dnowext": false,
+        "amd-no-ssb": false,
+        "npt": true,
+        "rdctl-no": true,
+        "vmx-invvpid": false,
+        "clwb": true,
+        "lbrv": false,
+        "adx": true,
+        "ss": false,
+        "pni": true,
+        "tsx-ldtrk": false,
+        "svm-lock": false,
+        "smep": true,
+        "smap": true,
+        "pfthreshold": false,
+        "vmx-invpcid-exit": false,
+        "x2apic": true,
+        "avx512vbmi": false,
+        "avx512vnni": false,
+        "vmx-apicv-x2apic": false,
+        "kvm-pv-sched-yield": true,
+        "vmx-invlpg-exit": false,
+        "vmx-invvpid-all-context": false,
+        "vmx-activity-hlt": false,
+        "flushbyasid": false,
+        "f16c": true,
+        "vmx-exit-ack-intr": false,
+        "ace2-en": false,
+        "pae": true,
+        "pat": true,
+        "sse": true,
+        "phe-en": false,
+        "vmx-tsc-offset": false,
+        "kvm-nopiodelay": true,
+        "tm": false,
+        "kvmclock-stable-bit": true,
+        "vmx-rdtsc-exit": false,
+        "hypervisor": true,
+        "vmx-rdtscp-exit": false,
+        "mds-no": true,
+        "pcommit": false,
+        "vmx-vpid": false,
+        "syscall": true,
+        "avx512dq": false,
+        "svm": true,
+        "invtsc": true,
+        "vmx-monitor-exit": false,
+        "sse2": true,
+        "ssbd": true,
+        "vmx-wbinvd-exit": false,
+        "est": false,
+        "kvm-poll-control": true,
+        "avx512ifma": false,
+        "tm2": false,
+        "kvm-pv-eoi": true,
+        "kvm-pv-ipi": true,
+        "cx8": true,
+        "vmx-invvpid-single-addr": false,
+        "waitpkg": false,
+        "cldemote": false,
+        "vmx-ept": false,
+        "kvm-mmu": false,
+        "sse4.2": true,
+        "pge": true,
+        "avx512bitalg": false,
+        "pdcm": false,
+        "vmx-entry-load-bndcfgs": false,
+        "vmx-exit-clear-rtit-ctl": false,
+        "model": 113,
+        "movbe": true,
+        "nrip-save": true,
+        "ssse3": true,
+        "sse4a": true,
+        "vmx-pause-exit": false,
+        "invpcid": false,
+        "pdpe1gb": true,
+        "tsc-deadline": true,
+        "skip-l1dfl-vmentry": true,
+        "vmx-exit-load-perf-global-ctrl": false,
+        "fma": true,
+        "cx16": true,
+        "de": true,
+        "stepping": 0,
+        "xsave": true,
+        "clflush": true,
+        "skinit": false,
+        "tsc": true,
+        "tce": false,
+        "fpu": true,
+        "ds-cpl": false,
+        "ibs": false,
+        "fma4": false,
+        "vmx-exit-nosave-debugctl": false,
+        "la57": false,
+        "vmx-invept": false,
+        "osvw": true,
+        "apic": true,
+        "pmm": false,
+        "vmx-entry-noload-debugctl": false,
+        "vmx-eptad": false,
+        "spec-ctrl": false,
+        "vmx-posted-intr": false,
+        "vmx-apicv-register": false,
+        "tsc-adjust": true,
+        "kvm-steal-time": true,
+        "avx512-vp2intersect": false,
+        "kvmclock": true,
+        "vmx-zero-len-inject": false,
+        "pschange-mc-no": true,
+        "vmx-rdrand-exit": false,
+        "lwp": false,
+        "amd-ssbd": true,
+        "xop": false,
+        "ibpb": true,
+        "avx": true,
+        "core-capability": false,
+        "vmx-invept-single-context": false,
+        "movdiri": false,
+        "acpi": false,
+        "avx512bw": false,
+        "ace2": false,
+        "fsgsbase": true,
+        "vmx-ept-2mb": false,
+        "vmx-ept-1gb": false,
+        "ht": false,
+        "vmx-io-exit": false,
+        "nx": true,
+        "pclmulqdq": true,
+        "mmxext": true,
+        "popcnt": true,
+        "vaes": false,
+        "serialize": false,
+        "movdir64b": false,
+        "xsaves": true,
+        "vmx-shadow-vmcs": false,
+        "lm": true,
+        "vmx-exit-save-preemption-timer": false,
+        "vmx-entry-load-pat": false,
+        "fsrm": false,
+        "vmx-entry-load-perf-global-ctrl": false,
+        "vmx-io-bitmap": false,
+        "umip": true,
+        "vmx-store-lma": false,
+        "vmx-movdr-exit": false,
+        "pse": true,
+        "avx2": true,
+        "sep": true,
+        "virt-ssbd": true,
+        "vmx-cr3-load-noexit": false,
+        "nodeid-msr": false,
+        "md-clear": false,
+        "misalignsse": true,
+        "split-lock-detect": false,
+        "min-xlevel": 2147483679,
+        "bmi1": true,
+        "bmi2": true,
+        "kvm-pv-unhalt": true,
+        "tsc-scale": false,
+        "topoext": false,
+        "amd-stibp": true,
+        "vmx-preemption-timer": false,
+        "clflushopt": true,
+        "vmx-vnmi-pending": false,
+        "monitor": false,
+        "vmx-vintr-pending": false,
+        "avx512er": false,
+        "full-width-write": false,
+        "pmm-en": false,
+        "pcid": false,
+        "taa-no": false,
+        "arch-capabilities": true,
+        "vmx-secondary-ctls": false,
+        "vmx-xsaves": false,
+        "clzero": true,
+        "3dnow": false,
+        "erms": false,
+        "vmx-entry-ia32e-mode": false,
+        "lahf-lm": true,
+        "vpclmulqdq": false,
+        "vmx-ins-outs": false,
+        "fxsr-opt": true,
+        "xstore": false,
+        "rtm": false,
+        "kvm-hint-dedicated": false,
+        "lmce": false,
+        "perfctr-nb": false,
+        "rdrand": true,
+        "rdseed": true,
+        "avx512-4vnniw": false,
+        "vme": true,
+        "vmx": false,
+        "dtes64": false,
+        "mtrr": true,
+        "rdtscp": true,
+        "xsaveerptr": true,
+        "pse36": true,
+        "kvm-pv-tlb-flush": true,
+        "vmx-activity-wait-sipi": false,
+        "tbm": false,
+        "wdt": false,
+        "vmx-rdpmc-exit": false,
+        "vmx-mtf": false,
+        "vmx-entry-load-efer": false,
+        "model-id": "AMD Ryzen 9 3900X 12-Core Processor            ",
+        "sha-ni": true,
+        "abm": true,
+        "vmx-ept-advanced-exitinfo": false,
+        "avx512pf": false,
+        "vmx-hlt-exit": false,
+        "xstore-en": false
+      }
+    }
+  },
+  "id": "libvirt-50"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index f8c64b4cc2..8e8abb35bb 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -3113,4 +3113,5 @@
   <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
   <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
   <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
+  <hypervCapabilities supported='no'/>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
index fc92caae54..8c78533719 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
@@ -24366,6 +24366,53 @@
   "id": "libvirt-44"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-45"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "host",
+      "props": {
+        "sve768": false,
+        "sve128": false,
+        "sve1024": false,
+        "sve1280": false,
+        "sve896": false,
+        "sve256": false,
+        "sve1536": false,
+        "sve1792": false,
+        "sve384": false,
+        "sve": false,
+        "sve2048": false,
+        "kvm-no-adjvtime": false,
+        "sve512": false,
+        "aarch64": true,
+        "pmu": true,
+        "sve1920": false,
+        "sve1152": false,
+        "kvm-steal-time": false,
+        "sve640": false,
+        "sve1408": false,
+        "sve1664": false
+      }
+    }
+  },
+  "id": "libvirt-45"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 7c8b98b600..eb12d0dab9 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -433,4 +433,5 @@
   <machine type='tcg' name='terrier' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/>
   <gic version='3' kernel='yes' emulated='yes'/>
   <gic version='2' kernel='no' emulated='yes'/>
+  <hypervCapabilities supported='no'/>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
index 7e96c37f80..f224bd2fee 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
@@ -27391,6 +27391,330 @@
   "id": "libvirt-49"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-50"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "base",
+      "props": {
+        "vmx-entry-load-rtit-ctl": false,
+        "cmov": true,
+        "ia64": false,
+        "ssb-no": false,
+        "aes": true,
+        "vmx-apicv-xapic": false,
+        "mmx": true,
+        "rdpid": true,
+        "arat": true,
+        "vmx-page-walk-4": false,
+        "vmx-page-walk-5": false,
+        "gfni": false,
+        "ibrs-all": false,
+        "vmx-desc-exit": false,
+        "pause-filter": false,
+        "xsavec": true,
+        "intel-pt": false,
+        "vmx-cr8-store-exit": false,
+        "vmx-rdseed-exit": false,
+        "vmx-eptp-switching": false,
+        "kvm-asyncpf": true,
+        "perfctr-core": true,
+        "mpx": false,
+        "pbe": false,
+        "avx512cd": false,
+        "decodeassists": false,
+        "vmx-exit-load-efer": false,
+        "vmx-exit-clear-bndcfgs": false,
+        "sse4.1": true,
+        "family": 23,
+        "vmx-vmwrite-vmexit-fields": false,
+        "kvm-asyncpf-int": true,
+        "vmx-vnmi": false,
+        "vmx-true-ctls": false,
+        "vmx-ept-execonly": false,
+        "vmx-exit-save-efer": false,
+        "vmx-invept-all-context": false,
+        "wbnoinvd": true,
+        "avx512f": false,
+        "msr": true,
+        "mce": true,
+        "mca": true,
+        "xcrypt": false,
+        "vmx-exit-load-pat": false,
+        "vmx-intr-exit": false,
+        "min-level": 16,
+        "vmx-flexpriority": false,
+        "xgetbv1": true,
+        "cid": false,
+        "ds": false,
+        "fxsr": true,
+        "avx512-bf16": false,
+        "vmx-cr8-load-exit": false,
+        "xsaveopt": true,
+        "vmx-apicv-vid": false,
+        "vmx-exit-save-pat": false,
+        "xtpr": false,
+        "tsx-ctrl": false,
+        "vmx-ple": false,
+        "avx512vl": false,
+        "avx512-vpopcntdq": false,
+        "phe": false,
+        "extapic": false,
+        "3dnowprefetch": true,
+        "vmx-vmfunc": false,
+        "vmx-activity-shutdown": false,
+        "avx512vbmi2": false,
+        "cr8legacy": true,
+        "vmx-encls-exit": false,
+        "stibp": true,
+        "vmx-msr-bitmap": false,
+        "xcrypt-en": false,
+        "vmx-mwait-exit": false,
+        "vmx-pml": false,
+        "vmx-nmi-exit": false,
+        "vmx-invept-single-context-noglobals": false,
+        "pn": false,
+        "rsba": false,
+        "dca": false,
+        "vendor": "AuthenticAMD",
+        "vmx-unrestricted-guest": false,
+        "vmx-cr3-store-noexit": false,
+        "pku": false,
+        "smx": false,
+        "cmp-legacy": true,
+        "avx512-4fmaps": false,
+        "vmcb-clean": false,
+        "hle": false,
+        "3dnowext": false,
+        "amd-no-ssb": false,
+        "npt": true,
+        "rdctl-no": true,
+        "vmx-invvpid": false,
+        "clwb": true,
+        "lbrv": false,
+        "adx": true,
+        "ss": false,
+        "pni": true,
+        "tsx-ldtrk": false,
+        "svm-lock": false,
+        "smep": true,
+        "smap": true,
+        "pfthreshold": false,
+        "vmx-invpcid-exit": false,
+        "x2apic": true,
+        "avx512vbmi": false,
+        "avx512vnni": false,
+        "vmx-apicv-x2apic": false,
+        "kvm-pv-sched-yield": true,
+        "vmx-invlpg-exit": false,
+        "vmx-invvpid-all-context": false,
+        "vmx-activity-hlt": false,
+        "flushbyasid": false,
+        "f16c": true,
+        "vmx-exit-ack-intr": false,
+        "ace2-en": false,
+        "pae": true,
+        "pat": true,
+        "sse": true,
+        "phe-en": false,
+        "vmx-tsc-offset": false,
+        "kvm-nopiodelay": true,
+        "tm": false,
+        "kvmclock-stable-bit": true,
+        "vmx-rdtsc-exit": false,
+        "hypervisor": true,
+        "vmx-rdtscp-exit": false,
+        "mds-no": true,
+        "pcommit": false,
+        "vmx-vpid": false,
+        "syscall": true,
+        "avx512dq": false,
+        "svm": true,
+        "invtsc": true,
+        "vmx-monitor-exit": false,
+        "sse2": true,
+        "ssbd": true,
+        "vmx-wbinvd-exit": false,
+        "est": false,
+        "kvm-poll-control": true,
+        "avx512ifma": false,
+        "tm2": false,
+        "kvm-pv-eoi": true,
+        "kvm-pv-ipi": true,
+        "cx8": true,
+        "vmx-invvpid-single-addr": false,
+        "waitpkg": false,
+        "cldemote": false,
+        "vmx-ept": false,
+        "kvm-mmu": false,
+        "sse4.2": true,
+        "pge": true,
+        "avx512bitalg": false,
+        "pdcm": false,
+        "vmx-entry-load-bndcfgs": false,
+        "vmx-exit-clear-rtit-ctl": false,
+        "model": 113,
+        "movbe": true,
+        "nrip-save": true,
+        "ssse3": true,
+        "sse4a": true,
+        "vmx-pause-exit": false,
+        "invpcid": false,
+        "pdpe1gb": true,
+        "tsc-deadline": true,
+        "skip-l1dfl-vmentry": true,
+        "vmx-exit-load-perf-global-ctrl": false,
+        "fma": true,
+        "cx16": true,
+        "de": true,
+        "stepping": 0,
+        "xsave": true,
+        "clflush": true,
+        "skinit": false,
+        "tsc": true,
+        "tce": false,
+        "fpu": true,
+        "ds-cpl": false,
+        "ibs": false,
+        "fma4": false,
+        "vmx-exit-nosave-debugctl": false,
+        "la57": false,
+        "vmx-invept": false,
+        "osvw": true,
+        "apic": true,
+        "pmm": false,
+        "vmx-entry-noload-debugctl": false,
+        "vmx-eptad": false,
+        "spec-ctrl": false,
+        "vmx-posted-intr": false,
+        "vmx-apicv-register": false,
+        "tsc-adjust": true,
+        "kvm-steal-time": true,
+        "avx512-vp2intersect": false,
+        "kvmclock": true,
+        "vmx-zero-len-inject": false,
+        "pschange-mc-no": true,
+        "vmx-rdrand-exit": false,
+        "lwp": false,
+        "amd-ssbd": true,
+        "xop": false,
+        "ibpb": true,
+        "avx": true,
+        "core-capability": false,
+        "vmx-invept-single-context": false,
+        "movdiri": false,
+        "acpi": false,
+        "avx512bw": false,
+        "ace2": false,
+        "fsgsbase": true,
+        "vmx-ept-2mb": false,
+        "vmx-ept-1gb": false,
+        "ht": false,
+        "vmx-io-exit": false,
+        "nx": true,
+        "pclmulqdq": true,
+        "mmxext": true,
+        "popcnt": true,
+        "vaes": false,
+        "serialize": false,
+        "movdir64b": false,
+        "xsaves": true,
+        "vmx-shadow-vmcs": false,
+        "lm": true,
+        "vmx-exit-save-preemption-timer": false,
+        "vmx-entry-load-pat": false,
+        "fsrm": false,
+        "vmx-entry-load-perf-global-ctrl": false,
+        "vmx-io-bitmap": false,
+        "umip": true,
+        "vmx-store-lma": false,
+        "vmx-movdr-exit": false,
+        "pse": true,
+        "avx2": true,
+        "sep": true,
+        "virt-ssbd": true,
+        "vmx-cr3-load-noexit": false,
+        "nodeid-msr": false,
+        "md-clear": false,
+        "misalignsse": true,
+        "split-lock-detect": false,
+        "min-xlevel": 2147483679,
+        "bmi1": true,
+        "bmi2": true,
+        "kvm-pv-unhalt": true,
+        "tsc-scale": false,
+        "topoext": false,
+        "amd-stibp": true,
+        "vmx-preemption-timer": false,
+        "clflushopt": true,
+        "vmx-vnmi-pending": false,
+        "monitor": false,
+        "vmx-vintr-pending": false,
+        "avx512er": false,
+        "full-width-write": false,
+        "pmm-en": false,
+        "pcid": false,
+        "taa-no": false,
+        "arch-capabilities": true,
+        "vmx-secondary-ctls": false,
+        "vmx-xsaves": false,
+        "clzero": true,
+        "3dnow": false,
+        "erms": false,
+        "vmx-entry-ia32e-mode": false,
+        "lahf-lm": true,
+        "vpclmulqdq": false,
+        "vmx-ins-outs": false,
+        "fxsr-opt": true,
+        "xstore": false,
+        "rtm": false,
+        "kvm-hint-dedicated": false,
+        "lmce": false,
+        "perfctr-nb": false,
+        "rdrand": true,
+        "rdseed": true,
+        "avx512-4vnniw": false,
+        "vme": true,
+        "vmx": false,
+        "dtes64": false,
+        "mtrr": true,
+        "rdtscp": true,
+        "xsaveerptr": true,
+        "pse36": true,
+        "kvm-pv-tlb-flush": true,
+        "vmx-activity-wait-sipi": false,
+        "tbm": false,
+        "wdt": false,
+        "vmx-rdpmc-exit": false,
+        "vmx-mtf": false,
+        "vmx-entry-load-efer": false,
+        "model-id": "AMD Ryzen 9 3900X 12-Core Processor            ",
+        "sha-ni": true,
+        "abm": true,
+        "vmx-ept-advanced-exitinfo": false,
+        "avx512pf": false,
+        "vmx-hlt-exit": false,
+        "xstore-en": false
+      }
+    }
+  },
+  "id": "libvirt-50"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 4c34fcef02..12cdf542e1 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -3123,4 +3123,5 @@
   <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <hypervCapabilities supported='no'/>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies
index 277180fa89..ed04553f29 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies
@@ -26323,6 +26323,53 @@
   "id": "libvirt-44"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-45"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "host",
+      "props": {
+        "sve768": false,
+        "sve128": false,
+        "sve1024": false,
+        "sve1280": false,
+        "sve896": false,
+        "sve256": false,
+        "sve1536": false,
+        "sve1792": false,
+        "sve384": false,
+        "sve": false,
+        "sve2048": false,
+        "kvm-no-adjvtime": false,
+        "sve512": false,
+        "aarch64": true,
+        "pmu": true,
+        "sve1920": false,
+        "sve1152": false,
+        "kvm-steal-time": true,
+        "sve640": false,
+        "sve1408": false,
+        "sve1664": false
+      }
+    }
+  },
+  "id": "libvirt-45"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 6f33a827b3..f8f7cafa23 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -456,4 +456,5 @@
   <machine type='tcg' name='terrier' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/>
   <gic version='3' kernel='yes' emulated='yes'/>
   <gic version='2' kernel='no' emulated='yes'/>
+  <hypervCapabilities supported='no'/>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
index bccf12118a..d815a91f4c 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
@@ -29316,6 +29316,342 @@
   "id": "libvirt-49"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-50"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "base",
+      "props": {
+        "vmx-entry-load-rtit-ctl": false,
+        "svme-addr-chk": false,
+        "cmov": true,
+        "ia64": false,
+        "ssb-no": false,
+        "aes": true,
+        "vmx-apicv-xapic": false,
+        "mmx": true,
+        "rdpid": true,
+        "arat": true,
+        "vmx-page-walk-4": false,
+        "vmx-page-walk-5": false,
+        "gfni": false,
+        "ibrs-all": false,
+        "vmx-desc-exit": false,
+        "pause-filter": false,
+        "bus-lock-detect": false,
+        "xsavec": true,
+        "intel-pt": false,
+        "vmx-cr8-store-exit": false,
+        "vmx-rdseed-exit": false,
+        "vmx-eptp-switching": false,
+        "kvm-asyncpf": true,
+        "perfctr-core": true,
+        "mpx": false,
+        "pbe": false,
+        "avx512cd": false,
+        "decodeassists": false,
+        "vmx-exit-load-efer": false,
+        "vmx-exit-clear-bndcfgs": false,
+        "sse4.1": true,
+        "family": 23,
+        "intel-pt-lip": false,
+        "vmx-vmwrite-vmexit-fields": false,
+        "kvm-asyncpf-int": true,
+        "vmx-vnmi": false,
+        "vmx-true-ctls": false,
+        "vmx-ept-execonly": false,
+        "vmx-exit-save-efer": false,
+        "vmx-invept-all-context": false,
+        "wbnoinvd": true,
+        "avx512f": false,
+        "msr": true,
+        "mce": true,
+        "mca": true,
+        "xcrypt": false,
+        "vmx-exit-load-pat": false,
+        "vmx-intr-exit": false,
+        "min-level": 16,
+        "vmx-flexpriority": false,
+        "xgetbv1": true,
+        "cid": false,
+        "ds": false,
+        "fxsr": true,
+        "avx512-fp16": false,
+        "avx512-bf16": false,
+        "vmx-cr8-load-exit": false,
+        "xsaveopt": true,
+        "vmx-apicv-vid": false,
+        "vmx-exit-save-pat": false,
+        "xtpr": false,
+        "tsx-ctrl": false,
+        "vmx-ple": false,
+        "avx512vl": false,
+        "avx512-vpopcntdq": false,
+        "phe": false,
+        "extapic": false,
+        "3dnowprefetch": true,
+        "vmx-vmfunc": false,
+        "vmx-activity-shutdown": false,
+        "avx512vbmi2": false,
+        "cr8legacy": true,
+        "vmx-encls-exit": false,
+        "stibp": true,
+        "vmx-msr-bitmap": false,
+        "xcrypt-en": false,
+        "vmx-mwait-exit": false,
+        "vmx-pml": false,
+        "vmx-nmi-exit": false,
+        "vmx-invept-single-context-noglobals": false,
+        "pn": false,
+        "rsba": false,
+        "dca": false,
+        "vendor": "AuthenticAMD",
+        "vmx-unrestricted-guest": false,
+        "vmx-cr3-store-noexit": false,
+        "pku": false,
+        "pks": false,
+        "smx": false,
+        "cmp-legacy": true,
+        "avx512-4fmaps": false,
+        "vmcb-clean": false,
+        "hle": false,
+        "3dnowext": false,
+        "amd-no-ssb": false,
+        "npt": true,
+        "rdctl-no": true,
+        "vmx-invvpid": false,
+        "clwb": true,
+        "lbrv": false,
+        "adx": true,
+        "ss": false,
+        "pni": true,
+        "tsx-ldtrk": false,
+        "svm-lock": false,
+        "smep": true,
+        "smap": true,
+        "pfthreshold": false,
+        "vmx-invpcid-exit": false,
+        "x2apic": true,
+        "avx512vbmi": false,
+        "avx512vnni": false,
+        "vmx-apicv-x2apic": false,
+        "kvm-pv-sched-yield": true,
+        "vmx-invlpg-exit": false,
+        "vmx-invvpid-all-context": false,
+        "vmx-activity-hlt": false,
+        "flushbyasid": false,
+        "f16c": true,
+        "vmx-exit-ack-intr": false,
+        "ace2-en": false,
+        "pae": true,
+        "pat": true,
+        "sse": true,
+        "phe-en": false,
+        "vmx-tsc-offset": false,
+        "kvm-nopiodelay": true,
+        "tm": false,
+        "kvmclock-stable-bit": true,
+        "vmx-rdtsc-exit": false,
+        "hypervisor": true,
+        "vmx-rdtscp-exit": false,
+        "mds-no": true,
+        "pcommit": false,
+        "vmx-vpid": false,
+        "syscall": true,
+        "avx512dq": false,
+        "svm": true,
+        "invtsc": true,
+        "vmx-monitor-exit": false,
+        "sse2": true,
+        "ssbd": true,
+        "vmx-wbinvd-exit": false,
+        "est": false,
+        "kvm-poll-control": true,
+        "avx512ifma": false,
+        "tm2": false,
+        "kvm-pv-eoi": true,
+        "kvm-pv-ipi": true,
+        "cx8": true,
+        "vmx-invvpid-single-addr": false,
+        "waitpkg": false,
+        "cldemote": false,
+        "vmx-ept": false,
+        "kvm-mmu": false,
+        "sse4.2": true,
+        "pge": true,
+        "avx512bitalg": false,
+        "pdcm": false,
+        "vmx-entry-load-bndcfgs": false,
+        "vmx-exit-clear-rtit-ctl": false,
+        "model": 113,
+        "movbe": true,
+        "nrip-save": true,
+        "ssse3": true,
+        "sse4a": true,
+        "kvm-msi-ext-dest-id": false,
+        "vmx-pause-exit": false,
+        "invpcid": false,
+        "pdpe1gb": true,
+        "tsc-deadline": true,
+        "skip-l1dfl-vmentry": true,
+        "vmx-exit-load-perf-global-ctrl": false,
+        "fma": true,
+        "cx16": true,
+        "de": true,
+        "stepping": 0,
+        "xsave": true,
+        "clflush": true,
+        "skinit": false,
+        "tsc": true,
+        "tce": false,
+        "fpu": true,
+        "ds-cpl": false,
+        "ibs": false,
+        "fma4": false,
+        "vmx-exit-nosave-debugctl": false,
+        "la57": false,
+        "vmx-invept": false,
+        "osvw": true,
+        "apic": true,
+        "pmm": false,
+        "vmx-entry-noload-debugctl": false,
+        "vmx-eptad": false,
+        "spec-ctrl": false,
+        "vmx-posted-intr": false,
+        "vmx-apicv-register": false,
+        "tsc-adjust": true,
+        "kvm-steal-time": true,
+        "avx512-vp2intersect": false,
+        "kvmclock": true,
+        "vmx-zero-len-inject": false,
+        "pschange-mc-no": true,
+        "v-vmsave-vmload": false,
+        "vmx-rdrand-exit": false,
+        "lwp": false,
+        "amd-ssbd": true,
+        "xop": false,
+        "ibpb": true,
+        "ibrs": false,
+        "avx": true,
+        "core-capability": false,
+        "vmx-invept-single-context": false,
+        "movdiri": false,
+        "acpi": false,
+        "avx512bw": false,
+        "ace2": false,
+        "fsgsbase": true,
+        "vmx-ept-2mb": false,
+        "vmx-ept-1gb": false,
+        "ht": false,
+        "vmx-io-exit": false,
+        "nx": true,
+        "pclmulqdq": true,
+        "mmxext": true,
+        "popcnt": true,
+        "vaes": false,
+        "serialize": false,
+        "movdir64b": false,
+        "xsaves": true,
+        "vmx-shadow-vmcs": false,
+        "lm": true,
+        "vmx-exit-save-preemption-timer": false,
+        "vmx-entry-load-pat": false,
+        "fsrm": false,
+        "vmx-entry-load-perf-global-ctrl": false,
+        "vmx-io-bitmap": false,
+        "umip": true,
+        "vmx-store-lma": false,
+        "vmx-movdr-exit": false,
+        "pse": true,
+        "avx2": true,
+        "avic": false,
+        "sep": true,
+        "virt-ssbd": true,
+        "vmx-cr3-load-noexit": false,
+        "nodeid-msr": false,
+        "md-clear": false,
+        "misalignsse": true,
+        "split-lock-detect": false,
+        "min-xlevel": 2147483679,
+        "bmi1": true,
+        "bmi2": true,
+        "kvm-pv-unhalt": true,
+        "tsc-scale": false,
+        "topoext": false,
+        "amd-stibp": true,
+        "vmx-preemption-timer": false,
+        "clflushopt": true,
+        "vmx-entry-load-pkrs": false,
+        "vmx-vnmi-pending": false,
+        "monitor": false,
+        "vmx-vintr-pending": false,
+        "avx512er": false,
+        "full-width-write": false,
+        "pmm-en": false,
+        "pcid": false,
+        "taa-no": false,
+        "arch-capabilities": true,
+        "vgif": false,
+        "vmx-secondary-ctls": false,
+        "vmx-xsaves": false,
+        "clzero": true,
+        "3dnow": false,
+        "erms": false,
+        "vmx-entry-ia32e-mode": false,
+        "lahf-lm": true,
+        "vpclmulqdq": false,
+        "vmx-ins-outs": false,
+        "fxsr-opt": true,
+        "xstore": false,
+        "rtm": false,
+        "kvm-hint-dedicated": false,
+        "lmce": false,
+        "perfctr-nb": false,
+        "rdrand": true,
+        "rdseed": true,
+        "avx512-4vnniw": false,
+        "vme": true,
+        "vmx": false,
+        "dtes64": false,
+        "mtrr": true,
+        "rdtscp": true,
+        "xsaveerptr": true,
+        "pse36": true,
+        "kvm-pv-tlb-flush": true,
+        "vmx-activity-wait-sipi": false,
+        "tbm": false,
+        "wdt": false,
+        "vmx-rdpmc-exit": false,
+        "vmx-mtf": false,
+        "vmx-entry-load-efer": false,
+        "model-id": "AMD Ryzen 9 3900X 12-Core Processor            ",
+        "sha-ni": true,
+        "vmx-exit-load-pkrs": false,
+        "abm": true,
+        "vmx-ept-advanced-exitinfo": false,
+        "avx512pf": false,
+        "vmx-hlt-exit": false,
+        "xstore-en": false
+      }
+    }
+  },
+  "id": "libvirt-50"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index ae511fdb96..6d61c0c1a1 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -3268,4 +3268,5 @@
     <pdh>AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA</pdh>
     <certChain>AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA</certChain>
   </sev>
+  <hypervCapabilities supported='no'/>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies
index b7f1337edd..e55adfbe66 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies
@@ -29797,6 +29797,344 @@
   "id": "libvirt-49"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-50"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "base",
+      "props": {
+        "vmx-entry-load-rtit-ctl": false,
+        "svme-addr-chk": true,
+        "cmov": true,
+        "ia64": false,
+        "ssb-no": false,
+        "aes": true,
+        "vmx-apicv-xapic": false,
+        "mmx": true,
+        "rdpid": true,
+        "arat": true,
+        "vmx-page-walk-4": false,
+        "vmx-page-walk-5": false,
+        "gfni": false,
+        "ibrs-all": false,
+        "vmx-desc-exit": false,
+        "pause-filter": false,
+        "bus-lock-detect": false,
+        "xsavec": true,
+        "intel-pt": false,
+        "vmx-tsc-scaling": false,
+        "vmx-cr8-store-exit": false,
+        "vmx-rdseed-exit": false,
+        "vmx-eptp-switching": false,
+        "kvm-asyncpf": true,
+        "perfctr-core": true,
+        "mpx": false,
+        "pbe": false,
+        "avx512cd": false,
+        "decodeassists": false,
+        "vmx-exit-load-efer": false,
+        "vmx-exit-clear-bndcfgs": false,
+        "sse4.1": true,
+        "family": 23,
+        "intel-pt-lip": false,
+        "vmx-vmwrite-vmexit-fields": false,
+        "kvm-asyncpf-int": true,
+        "vmx-vnmi": false,
+        "vmx-true-ctls": false,
+        "vmx-ept-execonly": false,
+        "vmx-exit-save-efer": false,
+        "vmx-invept-all-context": false,
+        "wbnoinvd": true,
+        "avx512f": false,
+        "msr": true,
+        "mce": true,
+        "mca": true,
+        "xcrypt": false,
+        "vmx-exit-load-pat": false,
+        "vmx-intr-exit": false,
+        "min-level": 16,
+        "vmx-flexpriority": false,
+        "xgetbv1": true,
+        "cid": false,
+        "ds": false,
+        "fxsr": true,
+        "avx512-fp16": false,
+        "avx512-bf16": false,
+        "vmx-cr8-load-exit": false,
+        "xsaveopt": true,
+        "vmx-apicv-vid": false,
+        "vmx-exit-save-pat": false,
+        "xtpr": false,
+        "tsx-ctrl": false,
+        "vmx-ple": false,
+        "avx512vl": false,
+        "avx512-vpopcntdq": false,
+        "phe": false,
+        "extapic": false,
+        "3dnowprefetch": true,
+        "vmx-vmfunc": false,
+        "vmx-activity-shutdown": false,
+        "avx512vbmi2": false,
+        "cr8legacy": true,
+        "vmx-encls-exit": false,
+        "stibp": true,
+        "vmx-msr-bitmap": false,
+        "xcrypt-en": false,
+        "vmx-mwait-exit": false,
+        "vmx-pml": false,
+        "vmx-nmi-exit": false,
+        "vmx-invept-single-context-noglobals": false,
+        "pn": false,
+        "rsba": false,
+        "dca": false,
+        "vendor": "AuthenticAMD",
+        "vmx-unrestricted-guest": false,
+        "vmx-cr3-store-noexit": false,
+        "pku": false,
+        "pks": false,
+        "smx": false,
+        "cmp-legacy": true,
+        "avx512-4fmaps": false,
+        "vmcb-clean": false,
+        "hle": false,
+        "avx-vnni": false,
+        "3dnowext": false,
+        "amd-no-ssb": false,
+        "npt": true,
+        "rdctl-no": true,
+        "vmx-invvpid": false,
+        "clwb": true,
+        "lbrv": false,
+        "adx": true,
+        "ss": false,
+        "pni": true,
+        "tsx-ldtrk": false,
+        "svm-lock": false,
+        "smep": true,
+        "smap": true,
+        "pfthreshold": false,
+        "vmx-invpcid-exit": false,
+        "x2apic": true,
+        "avx512vbmi": false,
+        "avx512vnni": false,
+        "vmx-apicv-x2apic": false,
+        "kvm-pv-sched-yield": true,
+        "vmx-invlpg-exit": false,
+        "vmx-invvpid-all-context": false,
+        "vmx-activity-hlt": false,
+        "flushbyasid": false,
+        "f16c": true,
+        "vmx-exit-ack-intr": false,
+        "ace2-en": false,
+        "pae": true,
+        "pat": true,
+        "sse": true,
+        "phe-en": false,
+        "vmx-tsc-offset": false,
+        "kvm-nopiodelay": true,
+        "tm": false,
+        "kvmclock-stable-bit": true,
+        "vmx-rdtsc-exit": false,
+        "hypervisor": true,
+        "vmx-rdtscp-exit": false,
+        "mds-no": true,
+        "pcommit": false,
+        "vmx-vpid": false,
+        "syscall": true,
+        "avx512dq": false,
+        "svm": true,
+        "invtsc": true,
+        "vmx-monitor-exit": false,
+        "sse2": true,
+        "ssbd": true,
+        "vmx-wbinvd-exit": false,
+        "est": false,
+        "kvm-poll-control": true,
+        "avx512ifma": false,
+        "tm2": false,
+        "kvm-pv-eoi": true,
+        "kvm-pv-ipi": true,
+        "cx8": true,
+        "vmx-invvpid-single-addr": false,
+        "waitpkg": false,
+        "cldemote": false,
+        "vmx-ept": false,
+        "kvm-mmu": false,
+        "sse4.2": true,
+        "pge": true,
+        "avx512bitalg": false,
+        "pdcm": false,
+        "vmx-entry-load-bndcfgs": false,
+        "vmx-exit-clear-rtit-ctl": false,
+        "model": 113,
+        "movbe": true,
+        "nrip-save": true,
+        "ssse3": true,
+        "sse4a": true,
+        "kvm-msi-ext-dest-id": false,
+        "vmx-pause-exit": false,
+        "invpcid": false,
+        "pdpe1gb": true,
+        "tsc-deadline": true,
+        "skip-l1dfl-vmentry": true,
+        "vmx-exit-load-perf-global-ctrl": false,
+        "fma": true,
+        "cx16": true,
+        "de": true,
+        "stepping": 0,
+        "xsave": true,
+        "clflush": true,
+        "skinit": false,
+        "tsc": true,
+        "tce": false,
+        "fpu": true,
+        "ds-cpl": false,
+        "ibs": false,
+        "fma4": false,
+        "vmx-exit-nosave-debugctl": false,
+        "la57": false,
+        "vmx-invept": false,
+        "osvw": true,
+        "apic": true,
+        "pmm": false,
+        "vmx-entry-noload-debugctl": false,
+        "vmx-eptad": false,
+        "spec-ctrl": false,
+        "vmx-posted-intr": false,
+        "vmx-apicv-register": false,
+        "tsc-adjust": true,
+        "kvm-steal-time": true,
+        "avx512-vp2intersect": false,
+        "kvmclock": true,
+        "vmx-zero-len-inject": false,
+        "pschange-mc-no": true,
+        "v-vmsave-vmload": false,
+        "vmx-rdrand-exit": false,
+        "lwp": false,
+        "amd-ssbd": true,
+        "xop": false,
+        "ibpb": true,
+        "ibrs": false,
+        "avx": true,
+        "core-capability": false,
+        "vmx-invept-single-context": false,
+        "movdiri": false,
+        "acpi": false,
+        "avx512bw": false,
+        "ace2": false,
+        "fsgsbase": true,
+        "vmx-ept-2mb": false,
+        "vmx-ept-1gb": false,
+        "ht": false,
+        "vmx-io-exit": false,
+        "nx": true,
+        "pclmulqdq": true,
+        "mmxext": true,
+        "popcnt": true,
+        "vaes": false,
+        "serialize": false,
+        "movdir64b": false,
+        "xsaves": true,
+        "vmx-shadow-vmcs": false,
+        "lm": true,
+        "vmx-exit-save-preemption-timer": false,
+        "vmx-entry-load-pat": false,
+        "fsrm": false,
+        "vmx-entry-load-perf-global-ctrl": false,
+        "vmx-io-bitmap": false,
+        "umip": true,
+        "vmx-store-lma": false,
+        "vmx-movdr-exit": false,
+        "pse": true,
+        "avx2": true,
+        "avic": false,
+        "sep": true,
+        "virt-ssbd": true,
+        "vmx-cr3-load-noexit": false,
+        "nodeid-msr": false,
+        "md-clear": false,
+        "misalignsse": true,
+        "split-lock-detect": false,
+        "min-xlevel": 2147483679,
+        "bmi1": true,
+        "bmi2": true,
+        "kvm-pv-unhalt": true,
+        "tsc-scale": false,
+        "topoext": false,
+        "amd-stibp": true,
+        "vmx-preemption-timer": false,
+        "clflushopt": true,
+        "vmx-entry-load-pkrs": false,
+        "vmx-vnmi-pending": false,
+        "monitor": false,
+        "vmx-vintr-pending": false,
+        "avx512er": false,
+        "full-width-write": false,
+        "pmm-en": false,
+        "pcid": false,
+        "taa-no": false,
+        "arch-capabilities": true,
+        "vgif": false,
+        "vmx-secondary-ctls": false,
+        "vmx-xsaves": false,
+        "clzero": true,
+        "3dnow": false,
+        "erms": false,
+        "vmx-entry-ia32e-mode": false,
+        "lahf-lm": true,
+        "vpclmulqdq": false,
+        "vmx-ins-outs": false,
+        "fxsr-opt": true,
+        "xstore": false,
+        "rtm": false,
+        "kvm-hint-dedicated": false,
+        "lmce": false,
+        "perfctr-nb": false,
+        "rdrand": true,
+        "rdseed": true,
+        "avx512-4vnniw": false,
+        "vme": true,
+        "vmx": false,
+        "dtes64": false,
+        "mtrr": true,
+        "rdtscp": true,
+        "xsaveerptr": true,
+        "pse36": true,
+        "kvm-pv-tlb-flush": true,
+        "vmx-activity-wait-sipi": false,
+        "tbm": false,
+        "wdt": false,
+        "vmx-rdpmc-exit": false,
+        "vmx-mtf": false,
+        "vmx-entry-load-efer": false,
+        "model-id": "AMD Ryzen 9 3900X 12-Core Processor            ",
+        "sha-ni": true,
+        "vmx-exit-load-pkrs": false,
+        "abm": true,
+        "vmx-ept-advanced-exitinfo": false,
+        "avx512pf": false,
+        "vmx-hlt-exit": false,
+        "xstore-en": false
+      }
+    }
+  },
+  "id": "libvirt-50"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 72af7d3f01..3709490efa 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -3615,4 +3615,5 @@
   <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <hypervCapabilities supported='no'/>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies
index 61118722a3..20d176e4b7 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies
@@ -27411,6 +27411,53 @@
   "id": "libvirt-45"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-46"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "host",
+      "props": {
+        "sve768": false,
+        "sve128": false,
+        "sve1024": false,
+        "sve1280": false,
+        "sve896": false,
+        "sve256": false,
+        "sve1536": false,
+        "sve1792": false,
+        "sve384": false,
+        "sve": false,
+        "sve2048": false,
+        "kvm-no-adjvtime": false,
+        "sve512": false,
+        "aarch64": true,
+        "pmu": true,
+        "sve1920": false,
+        "sve1152": false,
+        "kvm-steal-time": true,
+        "sve640": false,
+        "sve1408": false,
+        "sve1664": false
+      }
+    }
+  },
+  "id": "libvirt-46"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 10e67e4c5a..9dc6c58314 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -486,4 +486,5 @@
   <machine type='tcg' name='terrier' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/>
   <gic version='3' kernel='yes' emulated='yes'/>
   <gic version='2' kernel='no' emulated='yes'/>
+  <hypervCapabilities supported='no'/>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
index fb32cb7a03..d7da5068b0 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
@@ -33123,6 +33123,354 @@
   "id": "libvirt-50"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-51"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "base",
+      "props": {
+        "vmx-entry-load-rtit-ctl": false,
+        "svme-addr-chk": true,
+        "cmov": true,
+        "ia64": false,
+        "ssb-no": false,
+        "aes": true,
+        "vmx-apicv-xapic": false,
+        "mmx": true,
+        "rdpid": true,
+        "arat": true,
+        "vmx-page-walk-4": false,
+        "vmx-page-walk-5": false,
+        "gfni": false,
+        "ibrs-all": false,
+        "vmx-desc-exit": false,
+        "pause-filter": false,
+        "bus-lock-detect": false,
+        "xsavec": true,
+        "intel-pt": false,
+        "vmx-tsc-scaling": false,
+        "vmx-cr8-store-exit": false,
+        "vmx-rdseed-exit": false,
+        "vmx-eptp-switching": false,
+        "kvm-asyncpf": true,
+        "perfctr-core": true,
+        "mpx": false,
+        "pbe": false,
+        "avx512cd": false,
+        "decodeassists": false,
+        "vmx-exit-load-efer": false,
+        "vmx-exit-clear-bndcfgs": false,
+        "sse4.1": true,
+        "family": 23,
+        "intel-pt-lip": false,
+        "vmx-vmwrite-vmexit-fields": false,
+        "kvm-asyncpf-int": true,
+        "vmx-vnmi": false,
+        "vmx-true-ctls": false,
+        "vmx-ept-execonly": false,
+        "vmx-exit-save-efer": false,
+        "vmx-invept-all-context": false,
+        "wbnoinvd": true,
+        "avx512f": false,
+        "msr": true,
+        "mce": true,
+        "mca": true,
+        "xcrypt": false,
+        "sgx": false,
+        "vmx-exit-load-pat": false,
+        "vmx-intr-exit": false,
+        "min-level": 16,
+        "vmx-flexpriority": false,
+        "xgetbv1": true,
+        "cid": false,
+        "sgx-exinfo": false,
+        "ds": false,
+        "fxsr": true,
+        "avx512-fp16": false,
+        "avx512-bf16": false,
+        "vmx-cr8-load-exit": false,
+        "xsaveopt": true,
+        "vmx-apicv-vid": false,
+        "vmx-exit-save-pat": false,
+        "xtpr": false,
+        "tsx-ctrl": false,
+        "vmx-ple": false,
+        "avx512vl": false,
+        "avx512-vpopcntdq": false,
+        "phe": false,
+        "extapic": false,
+        "3dnowprefetch": true,
+        "vmx-vmfunc": false,
+        "vmx-activity-shutdown": false,
+        "sgx1": false,
+        "sgx2": false,
+        "avx512vbmi2": false,
+        "cr8legacy": true,
+        "vmx-encls-exit": false,
+        "stibp": true,
+        "vmx-msr-bitmap": false,
+        "xcrypt-en": false,
+        "vmx-mwait-exit": false,
+        "vmx-pml": false,
+        "vmx-nmi-exit": false,
+        "vmx-invept-single-context-noglobals": false,
+        "pn": false,
+        "rsba": false,
+        "dca": false,
+        "vendor": "AuthenticAMD",
+        "vmx-unrestricted-guest": false,
+        "vmx-cr3-store-noexit": false,
+        "pku": false,
+        "pks": false,
+        "smx": false,
+        "cmp-legacy": true,
+        "avx512-4fmaps": false,
+        "vmcb-clean": false,
+        "hle": false,
+        "avx-vnni": false,
+        "3dnowext": false,
+        "amd-no-ssb": false,
+        "npt": true,
+        "sgxlc": false,
+        "rdctl-no": true,
+        "vmx-invvpid": false,
+        "clwb": true,
+        "lbrv": false,
+        "adx": true,
+        "ss": false,
+        "pni": true,
+        "tsx-ldtrk": false,
+        "svm-lock": false,
+        "smep": true,
+        "smap": true,
+        "pfthreshold": false,
+        "vmx-invpcid-exit": false,
+        "x2apic": true,
+        "avx512vbmi": false,
+        "avx512vnni": false,
+        "vmx-apicv-x2apic": false,
+        "kvm-pv-sched-yield": true,
+        "vmx-invlpg-exit": false,
+        "vmx-invvpid-all-context": false,
+        "vmx-activity-hlt": false,
+        "flushbyasid": false,
+        "f16c": true,
+        "vmx-exit-ack-intr": false,
+        "ace2-en": false,
+        "pae": true,
+        "pat": true,
+        "sse": true,
+        "phe-en": false,
+        "vmx-tsc-offset": false,
+        "kvm-nopiodelay": true,
+        "tm": false,
+        "kvmclock-stable-bit": true,
+        "vmx-rdtsc-exit": false,
+        "hypervisor": true,
+        "vmx-rdtscp-exit": false,
+        "mds-no": true,
+        "pcommit": false,
+        "vmx-vpid": false,
+        "syscall": true,
+        "avx512dq": false,
+        "svm": true,
+        "invtsc": true,
+        "vmx-monitor-exit": false,
+        "sse2": true,
+        "ssbd": true,
+        "vmx-wbinvd-exit": false,
+        "est": false,
+        "kvm-poll-control": true,
+        "avx512ifma": false,
+        "tm2": false,
+        "kvm-pv-eoi": true,
+        "kvm-pv-ipi": true,
+        "cx8": true,
+        "vmx-invvpid-single-addr": false,
+        "waitpkg": false,
+        "cldemote": false,
+        "sgx-tokenkey": false,
+        "vmx-ept": false,
+        "kvm-mmu": false,
+        "sse4.2": true,
+        "pge": true,
+        "avx512bitalg": false,
+        "pdcm": false,
+        "vmx-entry-load-bndcfgs": false,
+        "vmx-exit-clear-rtit-ctl": false,
+        "model": 113,
+        "movbe": true,
+        "nrip-save": true,
+        "ssse3": true,
+        "sse4a": true,
+        "kvm-msi-ext-dest-id": false,
+        "vmx-pause-exit": false,
+        "invpcid": false,
+        "sgx-debug": false,
+        "pdpe1gb": true,
+        "sgx-mode64": false,
+        "tsc-deadline": true,
+        "skip-l1dfl-vmentry": true,
+        "vmx-exit-load-perf-global-ctrl": false,
+        "fma": true,
+        "cx16": true,
+        "de": true,
+        "stepping": 0,
+        "xsave": true,
+        "clflush": true,
+        "skinit": false,
+        "tsc": true,
+        "tce": false,
+        "fpu": true,
+        "ds-cpl": false,
+        "ibs": false,
+        "fma4": false,
+        "vmx-exit-nosave-debugctl": false,
+        "sgx-kss": false,
+        "la57": false,
+        "vmx-invept": false,
+        "osvw": true,
+        "apic": true,
+        "pmm": false,
+        "vmx-entry-noload-debugctl": false,
+        "vmx-eptad": false,
+        "spec-ctrl": false,
+        "vmx-posted-intr": false,
+        "vmx-apicv-register": false,
+        "tsc-adjust": true,
+        "kvm-steal-time": true,
+        "avx512-vp2intersect": false,
+        "kvmclock": true,
+        "vmx-zero-len-inject": false,
+        "pschange-mc-no": true,
+        "v-vmsave-vmload": false,
+        "vmx-rdrand-exit": false,
+        "sgx-provisionkey": false,
+        "lwp": false,
+        "amd-ssbd": true,
+        "xop": false,
+        "ibpb": true,
+        "ibrs": false,
+        "avx": true,
+        "core-capability": false,
+        "vmx-invept-single-context": false,
+        "movdiri": false,
+        "acpi": false,
+        "avx512bw": false,
+        "ace2": false,
+        "fsgsbase": true,
+        "vmx-ept-2mb": false,
+        "vmx-ept-1gb": false,
+        "ht": false,
+        "vmx-io-exit": false,
+        "nx": true,
+        "pclmulqdq": true,
+        "mmxext": true,
+        "popcnt": true,
+        "vaes": false,
+        "serialize": false,
+        "movdir64b": false,
+        "xsaves": true,
+        "vmx-shadow-vmcs": false,
+        "lm": true,
+        "vmx-exit-save-preemption-timer": false,
+        "vmx-entry-load-pat": false,
+        "fsrm": false,
+        "vmx-entry-load-perf-global-ctrl": false,
+        "vmx-io-bitmap": false,
+        "umip": true,
+        "vmx-store-lma": false,
+        "vmx-movdr-exit": false,
+        "pse": true,
+        "avx2": true,
+        "avic": false,
+        "sep": true,
+        "virt-ssbd": true,
+        "vmx-cr3-load-noexit": false,
+        "nodeid-msr": false,
+        "md-clear": false,
+        "misalignsse": true,
+        "split-lock-detect": false,
+        "min-xlevel": 2147483679,
+        "bmi1": true,
+        "bmi2": true,
+        "kvm-pv-unhalt": true,
+        "tsc-scale": false,
+        "topoext": false,
+        "amd-stibp": true,
+        "vmx-preemption-timer": false,
+        "clflushopt": true,
+        "vmx-entry-load-pkrs": false,
+        "vmx-vnmi-pending": false,
+        "monitor": false,
+        "vmx-vintr-pending": false,
+        "avx512er": false,
+        "full-width-write": false,
+        "pmm-en": false,
+        "pcid": false,
+        "taa-no": false,
+        "arch-capabilities": true,
+        "vgif": false,
+        "vmx-secondary-ctls": false,
+        "vmx-xsaves": false,
+        "clzero": true,
+        "3dnow": false,
+        "erms": false,
+        "vmx-entry-ia32e-mode": false,
+        "lahf-lm": true,
+        "vpclmulqdq": false,
+        "vmx-ins-outs": false,
+        "fxsr-opt": true,
+        "xstore": false,
+        "rtm": false,
+        "kvm-hint-dedicated": false,
+        "lmce": false,
+        "perfctr-nb": false,
+        "rdrand": true,
+        "rdseed": true,
+        "avx512-4vnniw": false,
+        "vme": true,
+        "vmx": false,
+        "dtes64": false,
+        "mtrr": true,
+        "rdtscp": true,
+        "xsaveerptr": true,
+        "pse36": true,
+        "kvm-pv-tlb-flush": true,
+        "vmx-activity-wait-sipi": false,
+        "tbm": false,
+        "wdt": false,
+        "vmx-rdpmc-exit": false,
+        "vmx-mtf": false,
+        "vmx-entry-load-efer": false,
+        "model-id": "AMD Ryzen 9 3900X 12-Core Processor            ",
+        "sha-ni": true,
+        "vmx-exit-load-pkrs": false,
+        "abm": true,
+        "vmx-ept-advanced-exitinfo": false,
+        "avx512pf": false,
+        "vmx-hlt-exit": false,
+        "xstore-en": false
+      }
+    }
+  },
+  "id": "libvirt-51"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index ef1c66a5d7..9233a4812b 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -3658,4 +3658,5 @@
   <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <hypervCapabilities supported='no'/>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies
index 6626778f0f..b330e842c2 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies
@@ -31164,6 +31164,54 @@
   "id": "libvirt-46"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-47"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "host",
+      "props": {
+        "sve768": false,
+        "sve128": false,
+        "sve1024": false,
+        "sve1280": false,
+        "sve896": false,
+        "sve256": false,
+        "sve1536": false,
+        "sve1792": false,
+        "sve384": false,
+        "sve": false,
+        "sve2048": false,
+        "pauth": false,
+        "kvm-no-adjvtime": false,
+        "sve512": false,
+        "aarch64": true,
+        "pmu": true,
+        "sve1920": false,
+        "sve1152": false,
+        "kvm-steal-time": true,
+        "sve640": false,
+        "sve1408": false,
+        "sve1664": false
+      }
+    }
+  },
+  "id": "libvirt-47"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index a59a91a576..36dc74ff74 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -501,4 +501,5 @@
   <machine type='tcg' name='terrier' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/>
   <gic version='3' kernel='yes' emulated='yes'/>
   <gic version='2' kernel='no' emulated='yes'/>
+  <hypervCapabilities supported='no'/>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
index a331006289..a4b1a8490f 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
@@ -33754,6 +33754,358 @@
   "id": "libvirt-50"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-51"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "base",
+      "props": {
+        "vmx-entry-load-rtit-ctl": false,
+        "svme-addr-chk": true,
+        "cmov": true,
+        "ia64": false,
+        "ssb-no": false,
+        "aes": true,
+        "vmx-apicv-xapic": false,
+        "mmx": true,
+        "rdpid": true,
+        "arat": true,
+        "vmx-page-walk-4": false,
+        "vmx-page-walk-5": false,
+        "gfni": false,
+        "ibrs-all": false,
+        "vmx-desc-exit": false,
+        "pause-filter": false,
+        "bus-lock-detect": false,
+        "xsavec": true,
+        "intel-pt": false,
+        "vmx-tsc-scaling": false,
+        "vmx-cr8-store-exit": false,
+        "vmx-rdseed-exit": false,
+        "vmx-eptp-switching": false,
+        "kvm-asyncpf": true,
+        "perfctr-core": true,
+        "mpx": false,
+        "pbe": false,
+        "avx512cd": false,
+        "decodeassists": false,
+        "vmx-exit-load-efer": false,
+        "vmx-exit-clear-bndcfgs": false,
+        "sse4.1": true,
+        "family": 23,
+        "intel-pt-lip": false,
+        "vmx-vmwrite-vmexit-fields": false,
+        "kvm-asyncpf-int": true,
+        "vmx-vnmi": false,
+        "vmx-true-ctls": false,
+        "vmx-ept-execonly": false,
+        "vmx-exit-save-efer": false,
+        "vmx-invept-all-context": false,
+        "wbnoinvd": true,
+        "avx512f": false,
+        "msr": true,
+        "mce": true,
+        "mca": true,
+        "xcrypt": false,
+        "sgx": false,
+        "vmx-exit-load-pat": false,
+        "vmx-intr-exit": false,
+        "min-level": 16,
+        "vmx-flexpriority": false,
+        "xgetbv1": true,
+        "cid": false,
+        "sgx-exinfo": false,
+        "ds": false,
+        "fxsr": true,
+        "avx512-fp16": false,
+        "avx512-bf16": false,
+        "vmx-cr8-load-exit": false,
+        "xsaveopt": true,
+        "vmx-apicv-vid": false,
+        "vmx-exit-save-pat": false,
+        "xtpr": false,
+        "tsx-ctrl": false,
+        "vmx-ple": false,
+        "avx512vl": false,
+        "avx512-vpopcntdq": false,
+        "phe": false,
+        "extapic": false,
+        "3dnowprefetch": true,
+        "vmx-vmfunc": false,
+        "vmx-activity-shutdown": false,
+        "sgx1": false,
+        "sgx2": false,
+        "avx512vbmi2": false,
+        "cr8legacy": true,
+        "vmx-encls-exit": false,
+        "stibp": true,
+        "vmx-msr-bitmap": false,
+        "xcrypt-en": false,
+        "vmx-mwait-exit": false,
+        "vmx-pml": false,
+        "vmx-nmi-exit": false,
+        "amx-tile": false,
+        "vmx-invept-single-context-noglobals": false,
+        "pn": false,
+        "rsba": false,
+        "dca": false,
+        "vendor": "AuthenticAMD",
+        "vmx-unrestricted-guest": false,
+        "vmx-cr3-store-noexit": false,
+        "pku": false,
+        "pks": false,
+        "smx": false,
+        "cmp-legacy": true,
+        "avx512-4fmaps": false,
+        "vmcb-clean": false,
+        "hle": false,
+        "avx-vnni": false,
+        "3dnowext": false,
+        "amd-no-ssb": false,
+        "npt": true,
+        "sgxlc": false,
+        "rdctl-no": true,
+        "vmx-invvpid": false,
+        "clwb": true,
+        "lbrv": false,
+        "adx": true,
+        "ss": false,
+        "pni": true,
+        "tsx-ldtrk": false,
+        "svm-lock": false,
+        "smep": true,
+        "smap": true,
+        "pfthreshold": false,
+        "vmx-invpcid-exit": false,
+        "amx-int8": false,
+        "x2apic": true,
+        "avx512vbmi": false,
+        "avx512vnni": false,
+        "vmx-apicv-x2apic": false,
+        "kvm-pv-sched-yield": true,
+        "vmx-invlpg-exit": false,
+        "vmx-invvpid-all-context": false,
+        "vmx-activity-hlt": false,
+        "flushbyasid": false,
+        "f16c": true,
+        "vmx-exit-ack-intr": false,
+        "ace2-en": false,
+        "pae": true,
+        "pat": true,
+        "sse": true,
+        "phe-en": false,
+        "vmx-tsc-offset": false,
+        "kvm-nopiodelay": true,
+        "tm": false,
+        "kvmclock-stable-bit": true,
+        "vmx-rdtsc-exit": false,
+        "hypervisor": true,
+        "vmx-rdtscp-exit": false,
+        "mds-no": true,
+        "pcommit": false,
+        "vmx-vpid": false,
+        "syscall": true,
+        "avx512dq": false,
+        "svm": true,
+        "invtsc": true,
+        "vmx-monitor-exit": false,
+        "sse2": true,
+        "ssbd": true,
+        "vmx-wbinvd-exit": false,
+        "est": false,
+        "kvm-poll-control": true,
+        "avx512ifma": false,
+        "tm2": false,
+        "kvm-pv-eoi": true,
+        "kvm-pv-ipi": true,
+        "cx8": true,
+        "vmx-invvpid-single-addr": false,
+        "waitpkg": false,
+        "cldemote": false,
+        "sgx-tokenkey": false,
+        "vmx-ept": false,
+        "xfd": false,
+        "kvm-mmu": false,
+        "sse4.2": true,
+        "pge": true,
+        "avx512bitalg": false,
+        "pdcm": false,
+        "vmx-entry-load-bndcfgs": false,
+        "vmx-exit-clear-rtit-ctl": false,
+        "model": 113,
+        "movbe": true,
+        "nrip-save": true,
+        "ssse3": true,
+        "sse4a": true,
+        "kvm-msi-ext-dest-id": false,
+        "vmx-pause-exit": false,
+        "invpcid": false,
+        "sgx-debug": false,
+        "pdpe1gb": true,
+        "sgx-mode64": false,
+        "tsc-deadline": true,
+        "skip-l1dfl-vmentry": true,
+        "vmx-exit-load-perf-global-ctrl": false,
+        "fma": true,
+        "cx16": true,
+        "de": true,
+        "stepping": 0,
+        "xsave": true,
+        "clflush": true,
+        "skinit": false,
+        "tsc": true,
+        "tce": false,
+        "fpu": true,
+        "ds-cpl": false,
+        "ibs": false,
+        "fma4": false,
+        "vmx-exit-nosave-debugctl": false,
+        "sgx-kss": false,
+        "la57": false,
+        "vmx-invept": false,
+        "osvw": true,
+        "apic": true,
+        "pmm": false,
+        "vmx-entry-noload-debugctl": false,
+        "vmx-eptad": false,
+        "spec-ctrl": false,
+        "vmx-posted-intr": false,
+        "vmx-apicv-register": false,
+        "tsc-adjust": true,
+        "kvm-steal-time": true,
+        "avx512-vp2intersect": false,
+        "kvmclock": true,
+        "vmx-zero-len-inject": false,
+        "pschange-mc-no": true,
+        "v-vmsave-vmload": false,
+        "vmx-rdrand-exit": false,
+        "sgx-provisionkey": false,
+        "lwp": false,
+        "amd-ssbd": true,
+        "xop": false,
+        "ibpb": true,
+        "ibrs": false,
+        "avx": true,
+        "core-capability": false,
+        "vmx-invept-single-context": false,
+        "movdiri": false,
+        "acpi": false,
+        "avx512bw": false,
+        "ace2": false,
+        "fsgsbase": true,
+        "vmx-ept-2mb": false,
+        "vmx-ept-1gb": false,
+        "ht": false,
+        "vmx-io-exit": false,
+        "nx": true,
+        "pclmulqdq": true,
+        "mmxext": true,
+        "popcnt": true,
+        "vaes": false,
+        "serialize": false,
+        "movdir64b": false,
+        "xsaves": true,
+        "vmx-shadow-vmcs": false,
+        "lm": true,
+        "vmx-exit-save-preemption-timer": false,
+        "vmx-entry-load-pat": false,
+        "fsrm": false,
+        "vmx-entry-load-perf-global-ctrl": false,
+        "vmx-io-bitmap": false,
+        "umip": true,
+        "vmx-store-lma": false,
+        "vmx-movdr-exit": false,
+        "pse": true,
+        "avx2": true,
+        "avic": false,
+        "sep": true,
+        "virt-ssbd": true,
+        "vmx-cr3-load-noexit": false,
+        "nodeid-msr": false,
+        "md-clear": false,
+        "misalignsse": true,
+        "split-lock-detect": false,
+        "min-xlevel": 2147483679,
+        "bmi1": true,
+        "bmi2": true,
+        "kvm-pv-unhalt": true,
+        "tsc-scale": true,
+        "topoext": false,
+        "amd-stibp": true,
+        "vmx-preemption-timer": false,
+        "clflushopt": true,
+        "vmx-entry-load-pkrs": false,
+        "vmx-vnmi-pending": false,
+        "monitor": false,
+        "vmx-vintr-pending": false,
+        "avx512er": false,
+        "full-width-write": false,
+        "pmm-en": false,
+        "pcid": false,
+        "taa-no": false,
+        "arch-capabilities": true,
+        "vgif": false,
+        "vmx-secondary-ctls": false,
+        "vmx-xsaves": false,
+        "clzero": true,
+        "3dnow": false,
+        "erms": false,
+        "vmx-entry-ia32e-mode": false,
+        "lahf-lm": true,
+        "vpclmulqdq": false,
+        "vmx-ins-outs": false,
+        "fxsr-opt": true,
+        "xstore": false,
+        "rtm": false,
+        "kvm-hint-dedicated": false,
+        "amx-bf16": false,
+        "lmce": false,
+        "perfctr-nb": false,
+        "rdrand": true,
+        "rdseed": true,
+        "avx512-4vnniw": false,
+        "vme": true,
+        "vmx": false,
+        "dtes64": false,
+        "mtrr": true,
+        "rdtscp": true,
+        "xsaveerptr": true,
+        "pse36": true,
+        "kvm-pv-tlb-flush": true,
+        "vmx-activity-wait-sipi": false,
+        "tbm": false,
+        "wdt": false,
+        "vmx-rdpmc-exit": false,
+        "vmx-mtf": false,
+        "vmx-entry-load-efer": false,
+        "model-id": "AMD Ryzen 9 3900X 12-Core Processor            ",
+        "sha-ni": true,
+        "vmx-exit-load-pkrs": false,
+        "abm": true,
+        "vmx-ept-advanced-exitinfo": false,
+        "avx512pf": false,
+        "vmx-hlt-exit": false,
+        "xstore-en": false
+      }
+    }
+  },
+  "id": "libvirt-51"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index d26d0c727a..20f5978946 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -3734,4 +3734,5 @@
       <section node='1' size='262144' unit='KiB'/>
     </sections>
   </sgx>
+  <hypervCapabilities supported='no'/>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
index 9eb851694f..1726cbc5f3 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
@@ -34436,6 +34436,359 @@
   "id": "libvirt-50"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-51"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "base",
+      "props": {
+        "vmx-entry-load-rtit-ctl": false,
+        "svme-addr-chk": true,
+        "cmov": true,
+        "ia64": false,
+        "ssb-no": false,
+        "aes": true,
+        "vmx-apicv-xapic": false,
+        "mmx": true,
+        "rdpid": true,
+        "arat": true,
+        "vmx-page-walk-4": false,
+        "vmx-page-walk-5": false,
+        "gfni": false,
+        "ibrs-all": false,
+        "vmx-desc-exit": false,
+        "pause-filter": false,
+        "bus-lock-detect": false,
+        "xsavec": true,
+        "intel-pt": false,
+        "vmx-tsc-scaling": false,
+        "vmx-cr8-store-exit": false,
+        "vmx-rdseed-exit": false,
+        "vmx-eptp-switching": false,
+        "kvm-asyncpf": true,
+        "perfctr-core": true,
+        "mpx": false,
+        "pbe": false,
+        "avx512cd": false,
+        "decodeassists": false,
+        "vmx-exit-load-efer": false,
+        "vmx-exit-clear-bndcfgs": false,
+        "sse4.1": true,
+        "family": 23,
+        "intel-pt-lip": false,
+        "vmx-vmwrite-vmexit-fields": false,
+        "kvm-asyncpf-int": true,
+        "vmx-vnmi": false,
+        "vmx-true-ctls": false,
+        "vmx-ept-execonly": false,
+        "vmx-exit-save-efer": false,
+        "vmx-invept-all-context": false,
+        "wbnoinvd": true,
+        "avx512f": false,
+        "msr": true,
+        "mce": true,
+        "mca": true,
+        "xcrypt": false,
+        "sgx": false,
+        "vmx-exit-load-pat": false,
+        "vmx-intr-exit": false,
+        "min-level": 16,
+        "vmx-flexpriority": false,
+        "xgetbv1": true,
+        "cid": false,
+        "sgx-exinfo": false,
+        "ds": false,
+        "fxsr": true,
+        "avx512-fp16": false,
+        "avx512-bf16": false,
+        "vmx-cr8-load-exit": false,
+        "xsaveopt": true,
+        "arch-lbr": false,
+        "vmx-apicv-vid": false,
+        "vmx-exit-save-pat": false,
+        "xtpr": false,
+        "tsx-ctrl": false,
+        "vmx-ple": false,
+        "avx512vl": false,
+        "avx512-vpopcntdq": false,
+        "phe": false,
+        "extapic": false,
+        "3dnowprefetch": true,
+        "vmx-vmfunc": false,
+        "vmx-activity-shutdown": false,
+        "sgx1": false,
+        "sgx2": false,
+        "avx512vbmi2": false,
+        "cr8legacy": true,
+        "vmx-encls-exit": false,
+        "stibp": true,
+        "vmx-msr-bitmap": false,
+        "xcrypt-en": false,
+        "vmx-mwait-exit": false,
+        "vmx-pml": false,
+        "vmx-nmi-exit": false,
+        "amx-tile": false,
+        "vmx-invept-single-context-noglobals": false,
+        "pn": false,
+        "rsba": false,
+        "dca": false,
+        "vendor": "AuthenticAMD",
+        "vmx-unrestricted-guest": false,
+        "vmx-cr3-store-noexit": false,
+        "pku": false,
+        "pks": false,
+        "smx": false,
+        "cmp-legacy": true,
+        "avx512-4fmaps": false,
+        "vmcb-clean": true,
+        "hle": false,
+        "avx-vnni": false,
+        "3dnowext": false,
+        "amd-no-ssb": false,
+        "npt": true,
+        "sgxlc": false,
+        "rdctl-no": true,
+        "vmx-invvpid": false,
+        "clwb": true,
+        "lbrv": false,
+        "adx": true,
+        "ss": false,
+        "pni": true,
+        "tsx-ldtrk": false,
+        "svm-lock": false,
+        "smep": true,
+        "smap": true,
+        "pfthreshold": false,
+        "vmx-invpcid-exit": false,
+        "amx-int8": false,
+        "x2apic": true,
+        "avx512vbmi": false,
+        "avx512vnni": false,
+        "vmx-apicv-x2apic": false,
+        "kvm-pv-sched-yield": true,
+        "vmx-invlpg-exit": false,
+        "vmx-invvpid-all-context": false,
+        "vmx-activity-hlt": false,
+        "flushbyasid": false,
+        "f16c": true,
+        "vmx-exit-ack-intr": false,
+        "ace2-en": false,
+        "pae": true,
+        "pat": true,
+        "sse": true,
+        "phe-en": false,
+        "vmx-tsc-offset": false,
+        "kvm-nopiodelay": true,
+        "tm": false,
+        "kvmclock-stable-bit": true,
+        "vmx-rdtsc-exit": false,
+        "hypervisor": true,
+        "vmx-rdtscp-exit": false,
+        "mds-no": true,
+        "pcommit": false,
+        "vmx-vpid": false,
+        "syscall": true,
+        "avx512dq": false,
+        "svm": true,
+        "invtsc": true,
+        "vmx-monitor-exit": false,
+        "sse2": true,
+        "ssbd": true,
+        "vmx-wbinvd-exit": false,
+        "est": false,
+        "kvm-poll-control": true,
+        "avx512ifma": false,
+        "tm2": false,
+        "kvm-pv-eoi": true,
+        "kvm-pv-ipi": true,
+        "cx8": true,
+        "vmx-invvpid-single-addr": false,
+        "waitpkg": false,
+        "cldemote": false,
+        "sgx-tokenkey": false,
+        "vmx-ept": false,
+        "xfd": false,
+        "kvm-mmu": false,
+        "sse4.2": true,
+        "pge": true,
+        "avx512bitalg": false,
+        "pdcm": false,
+        "vmx-entry-load-bndcfgs": false,
+        "vmx-exit-clear-rtit-ctl": false,
+        "model": 113,
+        "movbe": true,
+        "nrip-save": true,
+        "ssse3": true,
+        "sse4a": true,
+        "kvm-msi-ext-dest-id": false,
+        "vmx-pause-exit": false,
+        "invpcid": false,
+        "sgx-debug": false,
+        "pdpe1gb": true,
+        "sgx-mode64": false,
+        "tsc-deadline": true,
+        "skip-l1dfl-vmentry": true,
+        "vmx-exit-load-perf-global-ctrl": false,
+        "fma": true,
+        "cx16": true,
+        "de": true,
+        "stepping": 0,
+        "xsave": true,
+        "clflush": true,
+        "skinit": false,
+        "tsc": true,
+        "tce": false,
+        "fpu": true,
+        "ds-cpl": false,
+        "ibs": false,
+        "fma4": false,
+        "vmx-exit-nosave-debugctl": false,
+        "sgx-kss": false,
+        "la57": false,
+        "vmx-invept": false,
+        "osvw": true,
+        "apic": true,
+        "pmm": false,
+        "vmx-entry-noload-debugctl": false,
+        "vmx-eptad": false,
+        "spec-ctrl": false,
+        "vmx-posted-intr": false,
+        "vmx-apicv-register": false,
+        "tsc-adjust": true,
+        "kvm-steal-time": true,
+        "avx512-vp2intersect": false,
+        "kvmclock": true,
+        "vmx-zero-len-inject": false,
+        "pschange-mc-no": true,
+        "v-vmsave-vmload": false,
+        "vmx-rdrand-exit": false,
+        "sgx-provisionkey": false,
+        "lwp": false,
+        "amd-ssbd": true,
+        "xop": false,
+        "ibpb": true,
+        "ibrs": false,
+        "avx": true,
+        "core-capability": false,
+        "vmx-invept-single-context": false,
+        "movdiri": false,
+        "acpi": false,
+        "avx512bw": false,
+        "ace2": false,
+        "fsgsbase": true,
+        "vmx-ept-2mb": false,
+        "vmx-ept-1gb": false,
+        "ht": false,
+        "vmx-io-exit": false,
+        "nx": true,
+        "pclmulqdq": true,
+        "mmxext": true,
+        "popcnt": true,
+        "vaes": false,
+        "serialize": false,
+        "movdir64b": false,
+        "xsaves": true,
+        "vmx-shadow-vmcs": false,
+        "lm": true,
+        "vmx-exit-save-preemption-timer": false,
+        "vmx-entry-load-pat": false,
+        "fsrm": false,
+        "vmx-entry-load-perf-global-ctrl": false,
+        "vmx-io-bitmap": false,
+        "umip": true,
+        "vmx-store-lma": false,
+        "vmx-movdr-exit": false,
+        "pse": true,
+        "avx2": true,
+        "avic": false,
+        "sep": true,
+        "virt-ssbd": true,
+        "vmx-cr3-load-noexit": false,
+        "nodeid-msr": false,
+        "md-clear": false,
+        "misalignsse": true,
+        "split-lock-detect": false,
+        "min-xlevel": 2147483681,
+        "bmi1": true,
+        "bmi2": true,
+        "kvm-pv-unhalt": true,
+        "tsc-scale": true,
+        "topoext": false,
+        "amd-stibp": true,
+        "vmx-preemption-timer": false,
+        "clflushopt": true,
+        "vmx-entry-load-pkrs": false,
+        "vmx-vnmi-pending": false,
+        "monitor": false,
+        "vmx-vintr-pending": false,
+        "avx512er": false,
+        "full-width-write": false,
+        "pmm-en": false,
+        "pcid": false,
+        "taa-no": false,
+        "arch-capabilities": true,
+        "vgif": false,
+        "vmx-secondary-ctls": false,
+        "vmx-xsaves": false,
+        "clzero": true,
+        "3dnow": false,
+        "erms": false,
+        "vmx-entry-ia32e-mode": false,
+        "lahf-lm": true,
+        "vpclmulqdq": false,
+        "vmx-ins-outs": false,
+        "fxsr-opt": true,
+        "xstore": false,
+        "rtm": false,
+        "kvm-hint-dedicated": false,
+        "amx-bf16": false,
+        "lmce": false,
+        "perfctr-nb": false,
+        "rdrand": true,
+        "rdseed": true,
+        "avx512-4vnniw": false,
+        "vme": true,
+        "vmx": false,
+        "dtes64": false,
+        "mtrr": true,
+        "rdtscp": true,
+        "xsaveerptr": true,
+        "pse36": true,
+        "kvm-pv-tlb-flush": true,
+        "vmx-activity-wait-sipi": false,
+        "tbm": false,
+        "wdt": false,
+        "vmx-rdpmc-exit": false,
+        "vmx-mtf": false,
+        "vmx-entry-load-efer": false,
+        "model-id": "AMD Ryzen 9 3900X 12-Core Processor            ",
+        "sha-ni": true,
+        "vmx-exit-load-pkrs": false,
+        "abm": true,
+        "vmx-ept-advanced-exitinfo": false,
+        "avx512pf": false,
+        "vmx-hlt-exit": false,
+        "xstore-en": false
+      }
+    }
+  },
+  "id": "libvirt-51"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 8a2ed2236a..76eb84de1e 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -3524,4 +3524,5 @@
   <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <hypervCapabilities supported='no'/>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.replies
index 18f70a5a3f..6a465f6856 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.replies
@@ -35451,6 +35451,359 @@
   "id": "libvirt-50"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-51"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "base",
+      "props": {
+        "vmx-entry-load-rtit-ctl": false,
+        "svme-addr-chk": true,
+        "cmov": true,
+        "ia64": false,
+        "ssb-no": false,
+        "aes": true,
+        "vmx-apicv-xapic": false,
+        "mmx": true,
+        "rdpid": true,
+        "arat": true,
+        "vmx-page-walk-4": false,
+        "vmx-page-walk-5": false,
+        "gfni": false,
+        "ibrs-all": false,
+        "vmx-desc-exit": false,
+        "pause-filter": true,
+        "bus-lock-detect": false,
+        "xsavec": true,
+        "intel-pt": false,
+        "vmx-tsc-scaling": false,
+        "vmx-cr8-store-exit": false,
+        "vmx-rdseed-exit": false,
+        "vmx-eptp-switching": false,
+        "kvm-asyncpf": true,
+        "perfctr-core": true,
+        "mpx": false,
+        "pbe": false,
+        "avx512cd": false,
+        "decodeassists": false,
+        "vmx-exit-load-efer": false,
+        "vmx-exit-clear-bndcfgs": false,
+        "sse4.1": true,
+        "family": 23,
+        "intel-pt-lip": false,
+        "vmx-vmwrite-vmexit-fields": false,
+        "kvm-asyncpf-int": true,
+        "vmx-vnmi": false,
+        "vmx-true-ctls": false,
+        "vmx-ept-execonly": false,
+        "vmx-exit-save-efer": false,
+        "vmx-invept-all-context": false,
+        "wbnoinvd": true,
+        "avx512f": false,
+        "msr": true,
+        "mce": true,
+        "mca": true,
+        "xcrypt": false,
+        "sgx": false,
+        "vmx-exit-load-pat": false,
+        "vmx-intr-exit": false,
+        "min-level": 16,
+        "vmx-flexpriority": false,
+        "xgetbv1": true,
+        "cid": false,
+        "sgx-exinfo": false,
+        "ds": false,
+        "fxsr": true,
+        "avx512-fp16": false,
+        "avx512-bf16": false,
+        "vmx-cr8-load-exit": false,
+        "xsaveopt": true,
+        "arch-lbr": false,
+        "vmx-apicv-vid": false,
+        "vmx-exit-save-pat": false,
+        "xtpr": false,
+        "tsx-ctrl": false,
+        "vmx-ple": false,
+        "avx512vl": false,
+        "avx512-vpopcntdq": false,
+        "phe": false,
+        "extapic": false,
+        "3dnowprefetch": true,
+        "vmx-vmfunc": false,
+        "vmx-activity-shutdown": false,
+        "sgx1": false,
+        "sgx2": false,
+        "avx512vbmi2": false,
+        "cr8legacy": true,
+        "vmx-encls-exit": false,
+        "stibp": true,
+        "vmx-msr-bitmap": false,
+        "xcrypt-en": false,
+        "vmx-mwait-exit": false,
+        "vmx-pml": false,
+        "vmx-nmi-exit": false,
+        "amx-tile": false,
+        "vmx-invept-single-context-noglobals": false,
+        "pn": false,
+        "rsba": false,
+        "dca": false,
+        "vendor": "AuthenticAMD",
+        "vmx-unrestricted-guest": false,
+        "vmx-cr3-store-noexit": false,
+        "pku": false,
+        "pks": false,
+        "smx": false,
+        "cmp-legacy": true,
+        "avx512-4fmaps": false,
+        "vmcb-clean": true,
+        "hle": false,
+        "avx-vnni": false,
+        "3dnowext": false,
+        "amd-no-ssb": false,
+        "npt": true,
+        "sgxlc": false,
+        "rdctl-no": true,
+        "vmx-invvpid": false,
+        "clwb": true,
+        "lbrv": true,
+        "adx": true,
+        "ss": false,
+        "pni": true,
+        "tsx-ldtrk": false,
+        "svm-lock": false,
+        "smep": true,
+        "smap": true,
+        "pfthreshold": true,
+        "vmx-invpcid-exit": false,
+        "amx-int8": false,
+        "x2apic": true,
+        "avx512vbmi": false,
+        "avx512vnni": false,
+        "vmx-apicv-x2apic": false,
+        "kvm-pv-sched-yield": true,
+        "vmx-invlpg-exit": false,
+        "vmx-invvpid-all-context": false,
+        "vmx-activity-hlt": false,
+        "flushbyasid": false,
+        "f16c": true,
+        "vmx-exit-ack-intr": false,
+        "ace2-en": false,
+        "pae": true,
+        "pat": true,
+        "sse": true,
+        "phe-en": false,
+        "vmx-tsc-offset": false,
+        "kvm-nopiodelay": true,
+        "tm": false,
+        "kvmclock-stable-bit": true,
+        "vmx-rdtsc-exit": false,
+        "hypervisor": true,
+        "vmx-rdtscp-exit": false,
+        "mds-no": true,
+        "pcommit": false,
+        "vmx-vpid": false,
+        "syscall": true,
+        "avx512dq": false,
+        "svm": true,
+        "invtsc": true,
+        "vmx-monitor-exit": false,
+        "sse2": true,
+        "ssbd": true,
+        "vmx-wbinvd-exit": false,
+        "est": false,
+        "kvm-poll-control": true,
+        "avx512ifma": false,
+        "tm2": false,
+        "kvm-pv-eoi": true,
+        "kvm-pv-ipi": true,
+        "cx8": true,
+        "vmx-invvpid-single-addr": false,
+        "waitpkg": false,
+        "cldemote": false,
+        "sgx-tokenkey": false,
+        "vmx-ept": false,
+        "xfd": false,
+        "kvm-mmu": false,
+        "sse4.2": true,
+        "pge": true,
+        "avx512bitalg": false,
+        "pdcm": false,
+        "vmx-entry-load-bndcfgs": false,
+        "vmx-exit-clear-rtit-ctl": false,
+        "model": 113,
+        "movbe": true,
+        "nrip-save": true,
+        "ssse3": true,
+        "sse4a": true,
+        "kvm-msi-ext-dest-id": false,
+        "vmx-pause-exit": false,
+        "invpcid": false,
+        "sgx-debug": false,
+        "pdpe1gb": true,
+        "sgx-mode64": false,
+        "tsc-deadline": true,
+        "skip-l1dfl-vmentry": true,
+        "vmx-exit-load-perf-global-ctrl": false,
+        "fma": true,
+        "cx16": true,
+        "de": true,
+        "stepping": 0,
+        "xsave": true,
+        "clflush": true,
+        "skinit": false,
+        "tsc": true,
+        "tce": false,
+        "fpu": true,
+        "ds-cpl": false,
+        "ibs": false,
+        "fma4": false,
+        "vmx-exit-nosave-debugctl": false,
+        "sgx-kss": false,
+        "la57": false,
+        "vmx-invept": false,
+        "osvw": true,
+        "apic": true,
+        "pmm": false,
+        "vmx-entry-noload-debugctl": false,
+        "vmx-eptad": false,
+        "spec-ctrl": false,
+        "vmx-posted-intr": false,
+        "vmx-apicv-register": false,
+        "tsc-adjust": true,
+        "kvm-steal-time": true,
+        "avx512-vp2intersect": false,
+        "kvmclock": true,
+        "vmx-zero-len-inject": false,
+        "pschange-mc-no": true,
+        "v-vmsave-vmload": true,
+        "vmx-rdrand-exit": false,
+        "sgx-provisionkey": false,
+        "lwp": false,
+        "amd-ssbd": true,
+        "xop": false,
+        "ibpb": true,
+        "ibrs": false,
+        "avx": true,
+        "core-capability": false,
+        "vmx-invept-single-context": false,
+        "movdiri": false,
+        "acpi": false,
+        "avx512bw": false,
+        "ace2": false,
+        "fsgsbase": true,
+        "vmx-ept-2mb": false,
+        "vmx-ept-1gb": false,
+        "ht": false,
+        "vmx-io-exit": false,
+        "nx": true,
+        "pclmulqdq": true,
+        "mmxext": true,
+        "popcnt": true,
+        "vaes": false,
+        "serialize": false,
+        "movdir64b": false,
+        "xsaves": true,
+        "vmx-shadow-vmcs": false,
+        "lm": true,
+        "vmx-exit-save-preemption-timer": false,
+        "vmx-entry-load-pat": false,
+        "fsrm": false,
+        "vmx-entry-load-perf-global-ctrl": false,
+        "vmx-io-bitmap": false,
+        "umip": true,
+        "vmx-store-lma": false,
+        "vmx-movdr-exit": false,
+        "pse": true,
+        "avx2": true,
+        "avic": false,
+        "sep": true,
+        "virt-ssbd": true,
+        "vmx-cr3-load-noexit": false,
+        "nodeid-msr": false,
+        "md-clear": false,
+        "misalignsse": true,
+        "split-lock-detect": false,
+        "min-xlevel": 2147483681,
+        "bmi1": true,
+        "bmi2": true,
+        "kvm-pv-unhalt": true,
+        "tsc-scale": true,
+        "topoext": false,
+        "amd-stibp": true,
+        "vmx-preemption-timer": false,
+        "clflushopt": true,
+        "vmx-entry-load-pkrs": false,
+        "vmx-vnmi-pending": false,
+        "monitor": false,
+        "vmx-vintr-pending": false,
+        "avx512er": false,
+        "full-width-write": false,
+        "pmm-en": false,
+        "pcid": false,
+        "taa-no": false,
+        "arch-capabilities": true,
+        "vgif": true,
+        "vmx-secondary-ctls": false,
+        "vmx-xsaves": false,
+        "clzero": true,
+        "3dnow": false,
+        "erms": false,
+        "vmx-entry-ia32e-mode": false,
+        "lahf-lm": true,
+        "vpclmulqdq": false,
+        "vmx-ins-outs": false,
+        "fxsr-opt": true,
+        "xstore": false,
+        "rtm": false,
+        "kvm-hint-dedicated": false,
+        "amx-bf16": false,
+        "lmce": false,
+        "perfctr-nb": false,
+        "rdrand": true,
+        "rdseed": true,
+        "avx512-4vnniw": false,
+        "vme": true,
+        "vmx": false,
+        "dtes64": false,
+        "mtrr": true,
+        "rdtscp": true,
+        "xsaveerptr": true,
+        "pse36": true,
+        "kvm-pv-tlb-flush": true,
+        "vmx-activity-wait-sipi": false,
+        "tbm": false,
+        "wdt": false,
+        "vmx-rdpmc-exit": false,
+        "vmx-mtf": false,
+        "vmx-entry-load-efer": false,
+        "model-id": "AMD Ryzen 9 3900X 12-Core Processor            ",
+        "sha-ni": true,
+        "vmx-exit-load-pkrs": false,
+        "abm": true,
+        "vmx-ept-advanced-exitinfo": false,
+        "avx512pf": false,
+        "vmx-hlt-exit": false,
+        "xstore-en": false
+      }
+    }
+  },
+  "id": "libvirt-51"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
index 821fcd3199..af8247e23b 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
@@ -3246,4 +3246,5 @@
   <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <hypervCapabilities supported='no'/>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.replies
index 4cc3ca19a5..c3525f1bf8 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.replies
@@ -35614,6 +35614,464 @@
   "id": "libvirt-50"
 }
 
+{
+  "execute": "query-cpu-model-expansion",
+  "arguments": {
+    "type": "full",
+    "model": {
+      "name": "host",
+      "props": {
+        "migratable": false,
+        "hv-passthrough": true
+      }
+    }
+  },
+  "id": "libvirt-51"
+}
+
+{
+  "return": {
+    "model": {
+      "name": "host",
+      "props": {
+        "vmx-entry-load-rtit-ctl": false,
+        "phys-bits": 0,
+        "core-id": -1,
+        "svme-addr-chk": true,
+        "xlevel": 2147483681,
+        "cmov": true,
+        "ia64": false,
+        "hv-version-id-minor": 0,
+        "ssb-no": false,
+        "aes": true,
+        "vmx-apicv-xapic": false,
+        "kvm-pv-enforce-cpuid": false,
+        "mmx": true,
+        "arat": true,
+        "rdpid": true,
+        "vmx-page-walk-5": false,
+        "vmx-page-walk-4": false,
+        "vmx-desc-exit": false,
+        "gfni": false,
+        "ibrs-all": false,
+        "pause-filter": true,
+        "bus-lock-detect": false,
+        "xsavec": true,
+        "intel-pt": false,
+        "vmx-tsc-scaling": false,
+        "vmx-cr8-store-exit": false,
+        "hv-xmm-input": true,
+        "hv-frequencies": true,
+        "tsc-frequency": 0,
+        "vmx-rdseed-exit": false,
+        "xd": true,
+        "x-intel-pt-auto-level": true,
+        "hv-vendor-id": "Linux KVM Hv",
+        "vmx-eptp-switching": false,
+        "hv-syndbg": true,
+        "kvm-asyncpf": true,
+        "kvm_asyncpf": true,
+        "perfctr-core": true,
+        "perfctr_core": true,
+        "mpx": false,
+        "avx512cd": false,
+        "pbe": false,
+        "decodeassists": false,
+        "vmx-exit-load-efer": false,
+        "vmx-exit-clear-bndcfgs": false,
+        "sse4.1": true,
+        "sse4-1": true,
+        "sse4_1": true,
+        "family": 23,
+        "legacy-cache": true,
+        "intel-pt-lip": false,
+        "vmx-vmwrite-vmexit-fields": false,
+        "vmx-vnmi": false,
+        "kvm-asyncpf-int": true,
+        "vmx-true-ctls": false,
+        "host-phys-bits-limit": 0,
+        "vmx-ept-execonly": false,
+        "vmx-exit-save-efer": false,
+        "vmx-invept-all-context": false,
+        "vmware-cpuid-freq": true,
+        "wbnoinvd": true,
+        "avx512f": false,
+        "xcrypt": false,
+        "hv-runtime": true,
+        "hv-stimer-direct": true,
+        "mce": true,
+        "mca": true,
+        "msr": true,
+        "sgx": false,
+        "thread-id": -1,
+        "vmx-exit-load-pat": false,
+        "vmx-intr-exit": false,
+        "min-level": 16,
+        "vmx-flexpriority": false,
+        "xgetbv1": true,
+        "cid": false,
+        "hv-relaxed": true,
+        "sgx-exinfo": false,
+        "avx512-bf16": false,
+        "avx512-fp16": false,
+        "ds": false,
+        "hv-crash": true,
+        "fxsr": true,
+        "vmx-cr8-load-exit": false,
+        "hv-version-id-sbranch": 0,
+        "hv-version-id-snumber": 0,
+        "xsaveopt": true,
+        "arch-lbr": false,
+        "vmx-apicv-vid": false,
+        "vmx-exit-save-pat": false,
+        "tsx-ctrl": false,
+        "xtpr": false,
+        "vmx-ple": false,
+        "hv-evmcs": false,
+        "avx512-vpopcntdq": false,
+        "hv-version-id-spack": 0,
+        "phe": false,
+        "avx512vl": false,
+        "extapic": false,
+        "vmx-vmfunc": false,
+        "3dnowprefetch": true,
+        "vmx-activity-shutdown": false,
+        "sgx1": false,
+        "sgx2": false,
+        "avx512vbmi2": false,
+        "cr8legacy": true,
+        "vmx-encls-exit": false,
+        "stibp": true,
+        "vmx-msr-bitmap": false,
+        "cpuid-0xb": true,
+        "xcrypt-en": false,
+        "vmx-mwait-exit": false,
+        "kvm_pv_eoi": true,
+        "vmx-pml": false,
+        "apic-id": 4294967295,
+        "vmx-nmi-exit": false,
+        "vmx-invept-single-context-noglobals": false,
+        "amx-tile": false,
+        "pn": false,
+        "rsba": false,
+        "dca": false,
+        "vmx-unrestricted-guest": false,
+        "vendor": "AuthenticAMD",
+        "hv-ipi": true,
+        "vmx-cr3-store-noexit": false,
+        "pku": false,
+        "pks": false,
+        "smx": false,
+        "cmp-legacy": true,
+        "cmp_legacy": true,
+        "node-id": -1,
+        "avx512-4fmaps": false,
+        "vmcb-clean": true,
+        "vmcb_clean": true,
+        "hle": false,
+        "amd-no-ssb": false,
+        "3dnowext": false,
+        "avx-vnni": false,
+        "npt": true,
+        "sgxlc": false,
+        "rdctl-no": true,
+        "vmx-invvpid": false,
+        "memory": "/machine/unattached/system[0]",
+        "clwb": true,
+        "lbrv": true,
+        "adx": true,
+        "ss": false,
+        "pni": true,
+        "tsx-ldtrk": false,
+        "host-cache-info": false,
+        "svm-lock": false,
+        "svm_lock": false,
+        "pfthreshold": true,
+        "smap": true,
+        "smep": true,
+        "vmx-invpcid-exit": false,
+        "amx-int8": false,
+        "x2apic": true,
+        "avx512vnni": false,
+        "avx512vbmi": false,
+        "vmx-apicv-x2apic": false,
+        "hv-stimer": true,
+        "kvm-pv-sched-yield": true,
+        "vmx-invlpg-exit": false,
+        "x-hv-synic-kvm-only": false,
+        "vmx-invvpid-all-context": false,
+        "i64": true,
+        "vmx-activity-hlt": false,
+        "flushbyasid": false,
+        "f16c": true,
+        "vmx-exit-ack-intr": false,
+        "ace2-en": false,
+        "pae": true,
+        "pat": true,
+        "sse": true,
+        "die-id": -1,
+        "vmx-tsc-offset": false,
+        "phe-en": false,
+        "kvm-nopiodelay": true,
+        "kvm_nopiodelay": true,
+        "tm": false,
+        "hv-enforce-cpuid": false,
+        "kvmclock-stable-bit": true,
+        "vmx-rdtsc-exit": false,
+        "hypervisor": true,
+        "vmx-rdtscp-exit": false,
+        "socket-id": -1,
+        "mds-no": true,
+        "pcommit": false,
+        "vmx-vpid": false,
+        "syscall": true,
+        "level": 16,
+        "avx512dq": false,
+        "x-migrate-smi-count": true,
+        "svm": true,
+        "full-cpuid-auto-level": true,
+        "hv-avic": true,
+        "hv-reset": true,
+        "invtsc": true,
+        "vmx-monitor-exit": false,
+        "sse2": true,
+        "vmx-wbinvd-exit": false,
+        "ssbd": true,
+        "sse3": true,
+        "est": false,
+        "kvm-poll-control": true,
+        "kvm_poll_control": true,
+        "avx512ifma": false,
+        "tm2": false,
+        "start-powered-off": false,
+        "kvm-pv-eoi": true,
+        "kvm-pv-ipi": true,
+        "hv-emsr-bitmap": true,
+        "cx8": true,
+        "vmx-invvpid-single-addr": false,
+        "waitpkg": false,
+        "sgx-tokenkey": false,
+        "cldemote": false,
+        "vmx-ept": false,
+        "hv-tlbflush-direct": false,
+        "xfd": false,
+        "hv-reenlightenment": true,
+        "kvm-mmu": false,
+        "kvm_mmu": false,
+        "sse4.2": true,
+        "sse4-2": true,
+        "sse4_2": true,
+        "pge": true,
+        "fill-mtrr-mask": true,
+        "avx512bitalg": false,
+        "vmx-entry-load-bndcfgs": false,
+        "pdcm": false,
+        "nodeid_msr": false,
+        "vmx-exit-clear-rtit-ctl": false,
+        "hv-apicv": true,
+        "model": 113,
+        "movbe": true,
+        "nrip-save": true,
+        "nrip_save": true,
+        "vmx-pause-exit": false,
+        "ssse3": true,
+        "sse4a": true,
+        "kvm-msi-ext-dest-id": false,
+        "kvm_pv_unhalt": true,
+        "sgx-debug": false,
+        "invpcid": false,
+        "pdpe1gb": true,
+        "sgx-mode64": false,
+        "tsc-deadline": true,
+        "skip-l1dfl-vmentry": true,
+        "vmx-exit-load-perf-global-ctrl": false,
+        "fma": true,
+        "cx16": true,
+        "de": true,
+        "hv-version-id-build": 14393,
+        "enforce": false,
+        "stepping": 0,
+        "xsave": true,
+        "lbr-fmt": 18446744073709551552,
+        "lbr_fmt": 18446744073709551552,
+        "clflush": true,
+        "skinit": false,
+        "tsc": true,
+        "tce": false,
+        "kvm_asyncpf_int": true,
+        "fpu": true,
+        "ds-cpl": false,
+        "ibs": false,
+        "ds_cpl": false,
+        "fma4": false,
+        "host-phys-bits": true,
+        "sgx-kss": false,
+        "vmx-exit-nosave-debugctl": false,
+        "hv-version-id-major": 10,
+        "vmx-invept": false,
+        "la57": false,
+        "osvw": true,
+        "migratable": false,
+        "check": true,
+        "hv-spinlocks": 4095,
+        "vmx-eptad": false,
+        "pmu": true,
+        "vmx-entry-noload-debugctl": false,
+        "pmm": false,
+        "apic": true,
+        "spec-ctrl": false,
+        "vmx-posted-intr": false,
+        "vmx-apicv-register": false,
+        "min-xlevel2": 0,
+        "tsc-adjust": true,
+        "tsc_adjust": true,
+        "kvm-steal-time": true,
+        "kvm_steal_time": true,
+        "avx512-vp2intersect": false,
+        "kvmclock": true,
+        "vmx-zero-len-inject": false,
+        "l3-cache": true,
+        "pschange-mc-no": true,
+        "v-vmsave-vmload": true,
+        "sgx-provisionkey": false,
+        "vmx-rdrand-exit": false,
+        "lwp": false,
+        "hv-passthrough": true,
+        "amd-ssbd": true,
+        "ibpb": true,
+        "ibrs": false,
+        "xop": false,
+        "core-capability": false,
+        "avx": true,
+        "vmx-invept-single-context": false,
+        "movdiri": false,
+        "avx512bw": false,
+        "acpi": false,
+        "ace2": false,
+        "fsgsbase": true,
+        "hv-vapic": true,
+        "vmx-ept-2mb": false,
+        "vmx-ept-1gb": false,
+        "ht": false,
+        "vmx-io-exit": false,
+        "nx": true,
+        "pclmulqdq": true,
+        "mmxext": true,
+        "popcnt": true,
+        "vaes": false,
+        "serialize": false,
+        "xsaves": true,
+        "movdir64b": false,
+        "vmx-shadow-vmcs": false,
+        "tcg-cpuid": true,
+        "lm": true,
+        "vmx-exit-save-preemption-timer": false,
+        "vmx-entry-load-pat": false,
+        "fsrm": false,
+        "vmx-entry-load-perf-global-ctrl": false,
+        "vmx-io-bitmap": false,
+        "vmx-store-lma": false,
+        "umip": true,
+        "vmx-movdr-exit": false,
+        "avx2": true,
+        "pse": true,
+        "avic": false,
+        "sep": true,
+        "pclmuldq": true,
+        "vmx-cr3-load-noexit": false,
+        "virt-ssbd": true,
+        "x-hv-max-vps": 1024,
+        "nodeid-msr": false,
+        "md-clear": false,
+        "split-lock-detect": false,
+        "kvm": true,
+        "misalignsse": true,
+        "min-xlevel": 2147483681,
+        "realized": false,
+        "kvm-pv-unhalt": true,
+        "bmi2": true,
+        "bmi1": true,
+        "tsc-scale": true,
+        "tsc_scale": true,
+        "topoext": false,
+        "amd-stibp": true,
+        "hv-vpindex": true,
+        "hv-no-nonarch-coresharing": "off",
+        "ucode-rev": 0,
+        "vmx-preemption-timer": false,
+        "xlevel2": 0,
+        "vmx-entry-load-pkrs": false,
+        "clflushopt": true,
+        "vmx-vnmi-pending": false,
+        "kvm-no-smi-migration": false,
+        "monitor": false,
+        "vmx-vintr-pending": false,
+        "avx512er": false,
+        "full-width-write": false,
+        "pmm-en": false,
+        "taa-no": false,
+        "pcid": false,
+        "vgif": true,
+        "vmx-secondary-ctls": false,
+        "vmx-xsaves": false,
+        "arch-capabilities": true,
+        "x-vendor-cpuid-only": true,
+        "clzero": true,
+        "3dnow": false,
+        "erms": false,
+        "x-force-features": false,
+        "vmx-entry-ia32e-mode": false,
+        "lahf-lm": true,
+        "lahf_lm": true,
+        "vmx-ins-outs": false,
+        "vpclmulqdq": false,
+        "xstore": false,
+        "fxsr-opt": true,
+        "hv-synic": true,
+        "fxsr_opt": true,
+        "rtm": false,
+        "kvm-hint-dedicated": false,
+        "amx-bf16": false,
+        "lmce": false,
+        "hv-time": true,
+        "perfctr-nb": false,
+        "perfctr_nb": false,
+        "hv-tlbflush": true,
+        "ffxsr": true,
+        "rdrand": true,
+        "rdseed": true,
+        "avx512-4vnniw": false,
+        "vme": true,
+        "vmx": false,
+        "dtes64": false,
+        "mtrr": true,
+        "rdtscp": true,
+        "xsaveerptr": true,
+        "pse36": true,
+        "kvm-pv-tlb-flush": true,
+        "vmx-activity-wait-sipi": false,
+        "tbm": false,
+        "vmx-rdpmc-exit": false,
+        "wdt": false,
+        "vmx-entry-load-efer": false,
+        "level-func7": 0,
+        "vmx-mtf": false,
+        "hv-tlbflush-ext": false,
+        "pause_filter": true,
+        "model-id": "AMD Ryzen 9 3900X 12-Core Processor            ",
+        "sha-ni": true,
+        "vmx-exit-load-pkrs": false,
+        "abm": true,
+        "vmx-ept-advanced-exitinfo": false,
+        "avx512pf": false,
+        "vmx-hlt-exit": false,
+        "xstore-en": false
+      }
+    }
+  },
+  "id": "libvirt-51"
+}
+
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml
index 860ad2860a..cbade3b579 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml
@@ -3250,4 +3250,20 @@
   <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-7.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <hypervCapabilities supported='yes'>
+    <cap name='relaxed'/>
+    <cap name='vapic'/>
+    <cap name='spinlocks'/>
+    <cap name='vpindex'/>
+    <cap name='runtime'/>
+    <cap name='synic'/>
+    <cap name='stimer'/>
+    <cap name='reset'/>
+    <cap name='vendor_id'/>
+    <cap name='frequencies'/>
+    <cap name='reenlightenment'/>
+    <cap name='tlbflush'/>
+    <cap name='ipi'/>
+    <cap name='avic'/>
+  </hypervCapabilities>
 </qemuCaps>
-- 
2.38.2




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux