From d5d2d8e34a5a954139034179673971253d531423 Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Thu, 24 Oct 2019 14:19:38 +0200 Subject: [PATCH] qemu: Make probed machine types depend on accelerator MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Some specifics of machine types may depend on the accelerator and thus the data should be moved to virQEMUCapsAccel. The TCG machine types are just copied from the ones probed for KVM to simplify the changes to qemucapabilitiestest data files. Signed-off-by: Jiri Denemark Reviewed-by: Ján Tomko --- src/qemu/qemu_capabilities.c | 190 +++++++++------- .../caps_1.5.3.x86_64.xml | 45 ++-- .../caps_1.6.0.x86_64.xml | 51 +++-- .../caps_1.7.0.x86_64.xml | 57 +++-- .../caps_2.1.1.x86_64.xml | 69 ++++-- .../caps_2.10.0.aarch64.xml | 153 ++++++++----- .../caps_2.10.0.ppc64.xml | 63 ++++-- .../caps_2.10.0.s390x.xml | 21 +- .../caps_2.10.0.x86_64.xml | 105 ++++++--- .../caps_2.11.0.s390x.xml | 24 +- .../caps_2.11.0.x86_64.xml | 105 ++++++--- .../caps_2.12.0.aarch64.xml | 171 +++++++++----- .../caps_2.12.0.ppc64.xml | 75 ++++-- .../caps_2.12.0.s390x.xml | 27 ++- .../caps_2.12.0.x86_64.xml | 111 ++++++--- .../caps_2.4.0.x86_64.xml | 87 ++++--- .../caps_2.5.0.x86_64.xml | 93 +++++--- .../caps_2.6.0.aarch64.xml | 123 ++++++---- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 45 ++-- .../caps_2.6.0.x86_64.xml | 75 ++++-- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 12 +- .../caps_2.7.0.x86_64.xml | 81 ++++--- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 15 +- .../caps_2.8.0.x86_64.xml | 93 +++++--- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 60 +++-- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 18 +- .../caps_2.9.0.x86_64.xml | 99 +++++--- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 78 ++++--- .../caps_3.0.0.riscv32.xml | 10 +- .../caps_3.0.0.riscv64.xml | 10 +- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 30 ++- .../caps_3.0.0.x86_64.xml | 117 ++++++---- .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 81 ++++--- .../caps_3.1.0.x86_64.xml | 123 ++++++---- .../caps_4.0.0.aarch64.xml | 198 ++++++++++------ .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 84 ++++--- .../caps_4.0.0.riscv32.xml | 10 +- .../caps_4.0.0.riscv64.xml | 10 +- .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 36 ++- .../caps_4.0.0.x86_64.xml | 123 ++++++---- .../caps_4.1.0.x86_64.xml | 132 +++++++---- .../caps_4.2.0.aarch64.xml | 213 ++++++++++++------ .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 93 +++++--- .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 42 ++-- .../caps_4.2.0.x86_64.xml | 138 ++++++++---- 45 files changed, 2374 insertions(+), 1222 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 06c037d472..a1206e18a3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -584,6 +584,8 @@ struct _virQEMUCapsHostCPUData { typedef struct _virQEMUCapsAccel virQEMUCapsAccel; typedef virQEMUCapsAccel *virQEMUCapsAccelPtr; struct _virQEMUCapsAccel { + size_t nmachineTypes; + virQEMUCapsMachineTypePtr machineTypes; virQEMUCapsHostCPUData hostCPU; qemuMonitorCPUDefsPtr cpuModels; }; @@ -620,9 +622,6 @@ struct _virQEMUCaps { virHashTablePtr domCapsCache; - size_t nmachineTypes; - virQEMUCapsMachineTypePtr machineTypes; - size_t ngicCapabilities; virGICCapability *gicCapabilities; @@ -736,16 +735,16 @@ virQEMUCapsGetAccel(virQEMUCapsPtr qemuCaps, static void -virQEMUCapsSetDefaultMachine(virQEMUCapsPtr qemuCaps, +virQEMUCapsSetDefaultMachine(virQEMUCapsAccelPtr caps, size_t defIdx) { - virQEMUCapsMachineType tmp = qemuCaps->machineTypes[defIdx]; + virQEMUCapsMachineType tmp = caps->machineTypes[defIdx]; - memmove(qemuCaps->machineTypes + 1, - qemuCaps->machineTypes, - sizeof(qemuCaps->machineTypes[0]) * defIdx); + memmove(caps->machineTypes + 1, + caps->machineTypes, + sizeof(caps->machineTypes[0]) * defIdx); - qemuCaps->machineTypes[0] = tmp; + caps->machineTypes[0] = tmp; } @@ -842,26 +841,34 @@ virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps, virCapsGuestMachinePtr **machines) { size_t i; + virQEMUCapsAccelPtr accel; + + /* Guest capabilities do not report TCG vs. KVM caps separately. We just + * take the set of machine types we probed first. */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) + accel = &qemuCaps->kvm; + else + accel = &qemuCaps->tcg; *machines = NULL; - *nmachines = qemuCaps->nmachineTypes; + *nmachines = accel->nmachineTypes; if (*nmachines && - VIR_ALLOC_N(*machines, qemuCaps->nmachineTypes) < 0) + VIR_ALLOC_N(*machines, accel->nmachineTypes) < 0) goto error; - for (i = 0; i < qemuCaps->nmachineTypes; i++) { + for (i = 0; i < accel->nmachineTypes; i++) { virCapsGuestMachinePtr mach; if (VIR_ALLOC(mach) < 0) goto error; (*machines)[i] = mach; - if (qemuCaps->machineTypes[i].alias) { - mach->name = g_strdup(qemuCaps->machineTypes[i].alias); - mach->canonical = g_strdup(qemuCaps->machineTypes[i].name); + if (accel->machineTypes[i].alias) { + mach->name = g_strdup(accel->machineTypes[i].alias); + mach->canonical = g_strdup(accel->machineTypes[i].name); } else { - mach->name = g_strdup(qemuCaps->machineTypes[i].name); + mach->name = g_strdup(accel->machineTypes[i].name); } - mach->maxCpus = qemuCaps->machineTypes[i].maxCpus; + mach->maxCpus = accel->machineTypes[i].maxCpus; } /* Make sure all canonical machine types also have their own entry so that @@ -1690,8 +1697,8 @@ virQEMUCapsSEVInfoCopy(virSEVCapabilityPtr *dst, static void -virQEMUCapsCopyMachineTypes(virQEMUCapsPtr dst, - virQEMUCapsPtr src) +virQEMUCapsAccelCopyMachineTypes(virQEMUCapsAccelPtr dst, + virQEMUCapsAccelPtr src) { size_t i; @@ -1712,6 +1719,8 @@ static int virQEMUCapsAccelCopy(virQEMUCapsAccelPtr dst, virQEMUCapsAccelPtr src) { + virQEMUCapsAccelCopyMachineTypes(dst, src); + if (virQEMUCapsHostCPUDataCopy(&dst->hostCPU, &src->hostCPU) < 0) return -1; @@ -1751,8 +1760,6 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) virQEMUCapsAccelCopy(&ret->tcg, &qemuCaps->tcg) < 0) goto error; - virQEMUCapsCopyMachineTypes(ret, qemuCaps); - if (VIR_ALLOC_N(ret->gicCapabilities, qemuCaps->ngicCapabilities) < 0) goto error; ret->ngicCapabilities = qemuCaps->ngicCapabilities; @@ -1775,6 +1782,14 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) static void virQEMUCapsAccelClear(virQEMUCapsAccelPtr caps) { + size_t i; + + for (i = 0; i < caps->nmachineTypes; i++) { + VIR_FREE(caps->machineTypes[i].name); + VIR_FREE(caps->machineTypes[i].alias); + } + VIR_FREE(caps->machineTypes); + virQEMUCapsHostCPUDataClear(&caps->hostCPU); virObjectUnref(caps->cpuModels); } @@ -1783,13 +1798,6 @@ virQEMUCapsAccelClear(virQEMUCapsAccelPtr caps) void virQEMUCapsDispose(void *obj) { virQEMUCapsPtr qemuCaps = obj; - size_t i; - - for (i = 0; i < qemuCaps->nmachineTypes; i++) { - VIR_FREE(qemuCaps->machineTypes[i].name); - VIR_FREE(qemuCaps->machineTypes[i].alias); - } - VIR_FREE(qemuCaps->machineTypes); virHashFree(qemuCaps->domCapsCache); virBitmapFree(qemuCaps->flags); @@ -2118,19 +2126,22 @@ virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps, */ const char * virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps, - virDomainVirtType virtType G_GNUC_UNUSED, + virDomainVirtType virtType, const char *name) { + virQEMUCapsAccelPtr accel; size_t i; if (!name || !qemuCaps) return name; - for (i = 0; i < qemuCaps->nmachineTypes; i++) { - if (!qemuCaps->machineTypes[i].alias) + accel = virQEMUCapsGetAccel(qemuCaps, virtType); + + for (i = 0; i < accel->nmachineTypes; i++) { + if (!accel->machineTypes[i].alias) continue; - if (STREQ(qemuCaps->machineTypes[i].alias, name)) - return qemuCaps->machineTypes[i].name; + if (STREQ(accel->machineTypes[i].alias, name)) + return accel->machineTypes[i].name; } return name; @@ -2139,19 +2150,22 @@ virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps, int virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemuCaps, - virDomainVirtType virtType G_GNUC_UNUSED, + virDomainVirtType virtType, const char *name) { + virQEMUCapsAccelPtr accel; size_t i; if (!name) return 0; - for (i = 0; i < qemuCaps->nmachineTypes; i++) { - if (!qemuCaps->machineTypes[i].maxCpus) + accel = virQEMUCapsGetAccel(qemuCaps, virtType); + + for (i = 0; i < accel->nmachineTypes; i++) { + if (!accel->machineTypes[i].maxCpus) continue; - if (STREQ(qemuCaps->machineTypes[i].name, name)) - return qemuCaps->machineTypes[i].maxCpus; + if (STREQ(accel->machineTypes[i].name, name)) + return accel->machineTypes[i].maxCpus; } return 0; @@ -2160,14 +2174,17 @@ virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemuCaps, bool virQEMUCapsGetMachineHotplugCpus(virQEMUCapsPtr qemuCaps, - virDomainVirtType virtType G_GNUC_UNUSED, + virDomainVirtType virtType, const char *name) { + virQEMUCapsAccelPtr accel; size_t i; - for (i = 0; i < qemuCaps->nmachineTypes; i++) { - if (STREQ_NULLABLE(qemuCaps->machineTypes[i].name, name)) - return qemuCaps->machineTypes[i].hotplugCpus; + accel = virQEMUCapsGetAccel(qemuCaps, virtType); + + for (i = 0; i < accel->nmachineTypes; i++) { + if (STREQ_NULLABLE(accel->machineTypes[i].name, name)) + return accel->machineTypes[i].hotplugCpus; } return false; @@ -2380,6 +2397,7 @@ verify(G_N_ELEMENTS(preferredMachines) == VIR_ARCH_LAST); static int virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, + virQEMUCapsAccelPtr accel, qemuMonitorPtr mon) { qemuMonitorMachineInfoPtr *machines = NULL; @@ -2393,7 +2411,7 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, if ((nmachines = qemuMonitorGetMachines(mon, &machines)) < 0) return -1; - if (VIR_ALLOC_N(qemuCaps->machineTypes, nmachines) < 0) + if (VIR_ALLOC_N(accel->machineTypes, nmachines) < 0) goto cleanup; for (i = 0; i < nmachines; i++) { @@ -2401,7 +2419,7 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, if (STREQ(machines[i]->name, "none")) continue; - mach = &(qemuCaps->machineTypes[qemuCaps->nmachineTypes++]); + mach = &(accel->machineTypes[accel->nmachineTypes++]); mach->alias = g_strdup(machines[i]->alias); mach->name = g_strdup(machines[i]->name); @@ -2412,12 +2430,12 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, if (preferredMachine && (STREQ_NULLABLE(mach->alias, preferredMachine) || STREQ(mach->name, preferredMachine))) { - preferredIdx = qemuCaps->nmachineTypes - 1; + preferredIdx = accel->nmachineTypes - 1; } if (machines[i]->isDefault) { mach->qemuDefault = true; - defIdx = qemuCaps->nmachineTypes - 1; + defIdx = accel->nmachineTypes - 1; } } @@ -2433,7 +2451,7 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, if (preferredIdx == -1) preferredIdx = defIdx; if (preferredIdx != -1) - virQEMUCapsSetDefaultMachine(qemuCaps, preferredIdx); + virQEMUCapsSetDefaultMachine(accel, preferredIdx); ret = 0; @@ -2447,13 +2465,14 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, static bool virQEMUCapsIsMachineSupported(virQEMUCapsPtr qemuCaps, - virDomainVirtType virtType G_GNUC_UNUSED, + virDomainVirtType virtType, const char *canonical_machine) { + virQEMUCapsAccelPtr accel = virQEMUCapsGetAccel(qemuCaps, virtType); size_t i; - for (i = 0; i < qemuCaps->nmachineTypes; i++) { - if (STREQ(canonical_machine, qemuCaps->machineTypes[i].name)) + for (i = 0; i < accel->nmachineTypes; i++) { + if (STREQ(canonical_machine, accel->machineTypes[i].name)) return true; } return false; @@ -3576,15 +3595,17 @@ virQEMUCapsLoadCPUModels(virQEMUCapsAccelPtr caps, static int -virQEMUCapsLoadMachines(virQEMUCapsPtr qemuCaps, - xmlXPathContextPtr ctxt) +virQEMUCapsLoadMachines(virQEMUCapsAccelPtr caps, + xmlXPathContextPtr ctxt, + const char *typeStr) { + g_autofree char *xpath = g_strdup_printf("./machine[@type='%s']", typeStr); g_autofree xmlNodePtr *nodes = NULL; char *str = NULL; size_t i; int n; - if ((n = virXPathNodeSet("./machine", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet(xpath, ctxt, &nodes)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse qemu capabilities machines")); return -1; @@ -3593,21 +3614,21 @@ virQEMUCapsLoadMachines(virQEMUCapsPtr qemuCaps, if (n == 0) return 0; - qemuCaps->nmachineTypes = n; - if (VIR_ALLOC_N(qemuCaps->machineTypes, qemuCaps->nmachineTypes) < 0) + caps->nmachineTypes = n; + if (VIR_ALLOC_N(caps->machineTypes, caps->nmachineTypes) < 0) return -1; for (i = 0; i < n; i++) { - if (!(qemuCaps->machineTypes[i].name = virXMLPropString(nodes[i], "name"))) { + if (!(caps->machineTypes[i].name = virXMLPropString(nodes[i], "name"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing machine name in QEMU capabilities cache")); return -1; } - qemuCaps->machineTypes[i].alias = virXMLPropString(nodes[i], "alias"); + caps->machineTypes[i].alias = virXMLPropString(nodes[i], "alias"); str = virXMLPropString(nodes[i], "maxCpus"); if (str && - virStrToLong_ui(str, NULL, 10, &(qemuCaps->machineTypes[i].maxCpus)) < 0) { + virStrToLong_ui(str, NULL, 10, &(caps->machineTypes[i].maxCpus)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("malformed machine cpu count in QEMU capabilities cache")); return -1; @@ -3616,12 +3637,12 @@ virQEMUCapsLoadMachines(virQEMUCapsPtr qemuCaps, str = virXMLPropString(nodes[i], "hotplugCpus"); if (STREQ_NULLABLE(str, "yes")) - qemuCaps->machineTypes[i].hotplugCpus = true; + caps->machineTypes[i].hotplugCpus = true; VIR_FREE(str); str = virXMLPropString(nodes[i], "default"); if (STREQ_NULLABLE(str, "yes")) - qemuCaps->machineTypes[i].qemuDefault = true; + caps->machineTypes[i].qemuDefault = true; VIR_FREE(str); } @@ -3643,6 +3664,9 @@ virQEMUCapsLoadAccel(virQEMUCapsPtr qemuCaps, if (virQEMUCapsLoadCPUModels(caps, ctxt, typeStr) < 0) return -1; + if (virQEMUCapsLoadMachines(caps, ctxt, typeStr) < 0) + return -1; + return 0; } @@ -3862,9 +3886,6 @@ virQEMUCapsLoadCache(virArch hostArch, virQEMUCapsLoadAccel(qemuCaps, ctxt, VIR_DOMAIN_VIRT_QEMU) < 0) goto cleanup; - if (virQEMUCapsLoadMachines(qemuCaps, ctxt) < 0) - goto cleanup; - if ((n = virXPathNodeSet("./gic", ctxt, &nodes)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse qemu capabilities gic")); @@ -4045,21 +4066,23 @@ virQEMUCapsFormatCPUModels(virQEMUCapsAccelPtr caps, static void -virQEMUCapsFormatMachines(virQEMUCapsPtr qemuCaps, - virBufferPtr buf) +virQEMUCapsFormatMachines(virQEMUCapsAccelPtr caps, + virBufferPtr buf, + const char *typeStr) { size_t i; - for (i = 0; i < qemuCaps->nmachineTypes; i++) { - virBufferEscapeString(buf, "machineTypes[i].name); + for (i = 0; i < caps->nmachineTypes; i++) { + virBufferAsprintf(buf, "machineTypes[i].name); virBufferEscapeString(buf, " alias='%s'", - qemuCaps->machineTypes[i].alias); - if (qemuCaps->machineTypes[i].hotplugCpus) + caps->machineTypes[i].alias); + if (caps->machineTypes[i].hotplugCpus) virBufferAddLit(buf, " hotplugCpus='yes'"); virBufferAsprintf(buf, " maxCpus='%u'", - qemuCaps->machineTypes[i].maxCpus); - if (qemuCaps->machineTypes[i].qemuDefault) + caps->machineTypes[i].maxCpus); + if (caps->machineTypes[i].qemuDefault) virBufferAddLit(buf, " default='yes'"); virBufferAddLit(buf, "/>\n"); } @@ -4076,6 +4099,8 @@ virQEMUCapsFormatAccel(virQEMUCapsPtr qemuCaps, virQEMUCapsFormatHostCPUModelInfo(caps, buf, typeStr); virQEMUCapsFormatCPUModels(caps, buf, typeStr); + virQEMUCapsFormatMachines(caps, buf, typeStr); + } @@ -4142,8 +4167,6 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps) virArchToString(qemuCaps->arch)); virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_KVM); - virQEMUCapsFormatMachines(qemuCaps, &buf); - virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_QEMU); for (i = 0; i < qemuCaps->ngicCapabilities; i++) { @@ -4660,7 +4683,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, return -1; if (virQEMUCapsProbeQMPDevices(qemuCaps, mon) < 0) return -1; - if (virQEMUCapsProbeQMPMachineTypes(qemuCaps, mon) < 0) + if (virQEMUCapsProbeQMPMachineTypes(qemuCaps, accel, mon) < 0) return -1; if (virQEMUCapsProbeQMPMachineProps(qemuCaps, type, mon) < 0) return -1; @@ -4703,6 +4726,8 @@ virQEMUCapsInitQMPMonitorTCG(virQEMUCapsPtr qemuCaps, if (virQEMUCapsProbeQMPHostCPU(qemuCaps, accel, mon, VIR_DOMAIN_VIRT_QEMU) < 0) return -1; + virQEMUCapsAccelCopyMachineTypes(&qemuCaps->tcg, &qemuCaps->kvm); + return 0; } @@ -5213,11 +5238,13 @@ virQEMUCapsSupportsVmport(virQEMUCapsPtr qemuCaps, */ const char * virQEMUCapsGetPreferredMachine(virQEMUCapsPtr qemuCaps, - virDomainVirtType virtType G_GNUC_UNUSED) + virDomainVirtType virtType) { - if (!qemuCaps->nmachineTypes) + virQEMUCapsAccelPtr accel = virQEMUCapsGetAccel(qemuCaps, virtType); + + if (!accel->nmachineTypes) return NULL; - return qemuCaps->machineTypes[0].name; + return accel->machineTypes[0].name; } @@ -5722,6 +5749,9 @@ virQEMUCapsStripMachineAliases(virQEMUCapsPtr qemuCaps) { size_t i; - for (i = 0; i < qemuCaps->nmachineTypes; i++) - VIR_FREE(qemuCaps->machineTypes[i].alias); + for (i = 0; i < qemuCaps->kvm.nmachineTypes; i++) + VIR_FREE(qemuCaps->kvm.machineTypes[i].alias); + + for (i = 0; i < qemuCaps->tcg.nmachineTypes; i++) + VIR_FREE(qemuCaps->tcg.machineTypes[i].alias); } diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index a62a5534b8..3ee25a7ea7 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -112,21 +112,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -151,4 +151,19 @@ + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 3b34b97da0..cbeeb5c5e2 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -117,23 +117,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -158,4 +158,21 @@ + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index e99c2375d1..1424e1418d 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -119,25 +119,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -162,4 +162,23 @@ + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 1cb08f4039..f9ddfbef31 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -136,29 +136,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -184,4 +184,27 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 9375536242..a1da42ba16 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -176,57 +176,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -258,6 +258,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index a01fa35a81..8a6622efda 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -577,27 +577,27 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -1031,4 +1031,25 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 2bbb0f78d1..2bbd92aa37 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -207,13 +207,13 @@ - - - - - - - + + + + + + + @@ -1258,4 +1258,11 @@ + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 902056fe9d..8204db4fc4 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -528,41 +528,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -945,4 +945,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 3b498ff03e..8caf45f7e8 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -213,14 +213,14 @@ - - - - - - - - + + + + + + + + @@ -2604,4 +2604,12 @@ + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index f9ae66a4e5..5f34b945a5 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -505,41 +505,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -938,4 +938,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 661eac299a..5d1bfb798f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -193,63 +193,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -284,6 +284,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 7ba6407f8d..84179e8ef6 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -594,31 +594,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1056,4 +1056,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index e5f9955e35..4be4018d44 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -225,15 +225,15 @@ - - - - - - - - - + + + + + + + + + @@ -2473,4 +2473,13 @@ + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 576ffd55f0..81903cd493 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -661,43 +661,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1236,6 +1236,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 47 1 diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 8f997d72fa..9cfcf7bd2e 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -165,35 +165,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -222,4 +222,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index f4df7202bf..75a9c520fb 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -171,37 +171,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -230,4 +230,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 6fa907104b..de54df6ed1 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -158,47 +158,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -229,6 +229,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 3ce4526591..4e73396338 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -554,21 +554,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -999,4 +999,19 @@ + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 6662538d75..5d098faf47 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -183,31 +183,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -236,4 +236,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 7e78676191..02397403cb 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -95,9 +95,13 @@ s390x - - - - + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index a45fde31dd..887a2832af 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -189,33 +189,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -245,4 +245,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index da549442ea..1ee7fbfeec 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -180,11 +180,11 @@ - - - - - + + + + + @@ -249,4 +249,9 @@ + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 3a4f4869a8..b1db989ba4 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -218,37 +218,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -374,4 +374,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 36f6a642e5..e3833633d7 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -569,26 +569,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -1022,4 +1022,24 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 4d376e07fa..dade75081b 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -186,12 +186,12 @@ - - - - - - + + + + + + @@ -256,4 +256,10 @@ + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index d1409a6cba..12c3e6aef0 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -469,39 +469,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -861,4 +861,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 6160cd3e00..8714c3c1f4 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -596,32 +596,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1059,4 +1059,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 05c0612ae9..a31fc2a250 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -98,9 +98,9 @@ 0 riscv32 - - - - - + + + + + diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index 274bd0ee1d..6bf0e68725 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -98,9 +98,9 @@ 0 riscv64 - - - - - + + + + + diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index a7a18c03f2..941369003b 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -234,16 +234,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -2683,4 +2683,14 @@ + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 0a1147e796..92abf01e4e 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -578,45 +578,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1182,4 +1182,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 7a8ee6ce46..5667860b44 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -600,33 +600,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1064,4 +1064,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 0fbad25a37..5cdba54a11 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -657,47 +657,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1367,4 +1367,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml index 77cbb4dfa8..dacbadd208 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -209,72 +209,72 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -312,6 +312,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml index 3447d21e2e..cd860daa9f 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -614,34 +614,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1079,4 +1079,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 7503c2dbcd..a1a1a26ece 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -173,9 +173,9 @@ 0 v4.0.0 riscv32 - - - - - + + + + + diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 4a94179ee7..5bdc1e9451 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -173,9 +173,9 @@ 0 v4.0.0 riscv64 - - - - - + + + + + diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml index 72b23f55be..54f7aba2dc 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -248,18 +248,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -2896,4 +2896,16 @@ + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index 36a9d07ae0..90f8452710 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -664,47 +664,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1375,4 +1375,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index a88c71f5ab..d6446d2eb2 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -838,50 +838,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1942,4 +1942,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 6883985f2b..d9da9b993d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -233,77 +233,77 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -362,6 +362,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index f99130bdf4..eca48b59d9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -616,37 +616,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1084,4 +1084,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 3baa168048..b291deab44 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -371,20 +371,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -3342,4 +3342,18 @@ + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index dc2bc8c42c..39b9db63fd 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -841,52 +841,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1950,4 +1950,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.39.5