[PATCH v2 0/3] qemu: Use -numa memdev= if -numa mem= is unavailable
v2 of: https://www.redhat.com/archives/libvir-list/2020-May/msg00490.html diff to v1: - different approach used. I completely forgot about the discussion we had, but after Dan pointed it out to me, it clicked. Michal Prívozník (3): qemu: Track numa-mem-supported machine attribute qemuBuildNumaArgStr: Switch order of if() and for() qemuBuildNumaArgStr: Use modern -numa memdev= if old -numa mem= is unsupported src/qemu/qemu_capabilities.c | 44 ++- src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_capspriv.h | 3 +- src/qemu/qemu_command.c | 17 +- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 11 + .../caps_1.5.3.x86_64.xml | 60 ++-- .../caps_1.6.0.x86_64.xml | 68 ++--- .../caps_1.7.0.x86_64.xml | 76 ++--- .../caps_2.1.1.x86_64.xml | 92 +++--- .../caps_2.10.0.aarch64.xml | 204 +++++++------- .../caps_2.10.0.ppc64.xml | 84 +++--- .../caps_2.10.0.s390x.xml | 28 +- .../caps_2.10.0.x86_64.xml | 140 +++++----- .../caps_2.11.0.s390x.xml | 32 +-- .../caps_2.11.0.x86_64.xml | 140 +++++----- .../caps_2.12.0.aarch64.xml | 228 +++++++-------- .../caps_2.12.0.ppc64.xml | 100 +++---- .../caps_2.12.0.s390x.xml | 36 +-- .../caps_2.12.0.x86_64.xml | 148 +++++----- .../caps_2.4.0.x86_64.xml | 116 ++++---- .../caps_2.5.0.x86_64.xml | 124 ++++---- .../caps_2.6.0.aarch64.xml | 164 +++++------ .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 60 ++-- .../caps_2.6.0.x86_64.xml | 100 +++---- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 16 +- .../caps_2.7.0.x86_64.xml | 108 +++---- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 20 +- .../caps_2.8.0.x86_64.xml | 124 ++++---- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 80 +++--- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 24 +- .../caps_2.9.0.x86_64.xml | 132 ++++----- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 104 +++---- .../caps_3.0.0.riscv32.xml | 10 +- .../caps_3.0.0.riscv64.xml | 10 +- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 40 +-- .../caps_3.0.0.x86_64.xml | 156 +++++------ .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 108 +++---- .../caps_3.1.0.x86_64.xml | 164 +++++------ .../caps_4.0.0.aarch64.xml | 264 +++++++++--------- .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 112 ++++---- .../caps_4.0.0.riscv32.xml | 10 +- .../caps_4.0.0.riscv64.xml | 10 +- .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 48 ++-- .../caps_4.0.0.x86_64.xml | 164 +++++------ .../caps_4.1.0.x86_64.xml | 176 ++++++------ .../caps_4.2.0.aarch64.xml | 52 ++-- .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 72 ++--- .../caps_4.2.0.x86_64.xml | 184 ++++++------ .../caps_5.0.0.aarch64.xml | 52 ++-- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 76 ++--- .../caps_5.0.0.x86_64.xml | 176 ++++++------ .../caps_5.1.0.x86_64.xml | 176 ++++++------ tests/testutilsqemu.c | 6 +- 54 files changed, 2408 insertions(+), 2345 deletions(-) -- 2.26.2
There is 'numa-mem-supported' machine attribute which specifies whether '-numa mem=' is supported. Store it in our capabilities as it will be used in later commits when building the command line. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 44 ++- src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_capspriv.h | 3 +- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 11 + .../caps_1.5.3.x86_64.xml | 60 ++-- .../caps_1.6.0.x86_64.xml | 68 ++--- .../caps_1.7.0.x86_64.xml | 76 ++--- .../caps_2.1.1.x86_64.xml | 92 +++--- .../caps_2.10.0.aarch64.xml | 204 +++++++------- .../caps_2.10.0.ppc64.xml | 84 +++--- .../caps_2.10.0.s390x.xml | 28 +- .../caps_2.10.0.x86_64.xml | 140 +++++----- .../caps_2.11.0.s390x.xml | 32 +-- .../caps_2.11.0.x86_64.xml | 140 +++++----- .../caps_2.12.0.aarch64.xml | 228 +++++++-------- .../caps_2.12.0.ppc64.xml | 100 +++---- .../caps_2.12.0.s390x.xml | 36 +-- .../caps_2.12.0.x86_64.xml | 148 +++++----- .../caps_2.4.0.x86_64.xml | 116 ++++---- .../caps_2.5.0.x86_64.xml | 124 ++++---- .../caps_2.6.0.aarch64.xml | 164 +++++------ .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 60 ++-- .../caps_2.6.0.x86_64.xml | 100 +++---- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 16 +- .../caps_2.7.0.x86_64.xml | 108 +++---- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 20 +- .../caps_2.8.0.x86_64.xml | 124 ++++---- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 80 +++--- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 24 +- .../caps_2.9.0.x86_64.xml | 132 ++++----- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 104 +++---- .../caps_3.0.0.riscv32.xml | 10 +- .../caps_3.0.0.riscv64.xml | 10 +- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 40 +-- .../caps_3.0.0.x86_64.xml | 156 +++++------ .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 108 +++---- .../caps_3.1.0.x86_64.xml | 164 +++++------ .../caps_4.0.0.aarch64.xml | 264 +++++++++--------- .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 112 ++++---- .../caps_4.0.0.riscv32.xml | 10 +- .../caps_4.0.0.riscv64.xml | 10 +- .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 48 ++-- .../caps_4.0.0.x86_64.xml | 164 +++++------ .../caps_4.1.0.x86_64.xml | 176 ++++++------ .../caps_4.2.0.aarch64.xml | 52 ++-- .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 72 ++--- .../caps_4.2.0.x86_64.xml | 184 ++++++------ .../caps_5.0.0.aarch64.xml | 52 ++-- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 76 ++--- .../caps_5.0.0.x86_64.xml | 176 ++++++------ .../caps_5.1.0.x86_64.xml | 176 ++++++------ tests/testutilsqemu.c | 6 +- 53 files changed, 2395 insertions(+), 2341 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7e711f22f8..2676fbab6f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -594,6 +594,7 @@ struct _virQEMUCapsMachineType { bool hotplugCpus; bool qemuDefault; char *defaultCPU; + bool numaMemSupported; }; typedef struct _virQEMUCapsHostCPUData virQEMUCapsHostCPUData; @@ -1869,6 +1870,7 @@ virQEMUCapsAccelCopyMachineTypes(virQEMUCapsAccelPtr dst, dst->machineTypes[i].maxCpus = src->machineTypes[i].maxCpus; dst->machineTypes[i].hotplugCpus = src->machineTypes[i].hotplugCpus; dst->machineTypes[i].qemuDefault = src->machineTypes[i].qemuDefault; + dst->machineTypes[i].numaMemSupported = src->machineTypes[i].numaMemSupported; } } @@ -2510,6 +2512,28 @@ virQEMUCapsGetMachineDefaultCPU(virQEMUCapsPtr qemuCaps, } +bool +virQEMUCapsGetMachineNumaMemSupported(virQEMUCapsPtr qemuCaps, + virDomainVirtType virtType, + const char *name) +{ + virQEMUCapsAccelPtr accel; + size_t i; + + if (!name) + return 0; + + accel = virQEMUCapsGetAccel(qemuCaps, virtType); + + for (i = 0; i < accel->nmachineTypes; i++) { + if (STREQ(accel->machineTypes[i].name, name)) + return accel->machineTypes[i].numaMemSupported; + } + + return false; +} + + /** * virQEMUCapsSetGICCapabilities: * @qemuCaps: QEMU capabilities @@ -2745,7 +2769,8 @@ virQEMUCapsAddMachine(virQEMUCapsPtr qemuCaps, const char *defaultCPU, int maxCpus, bool hotplugCpus, - bool isDefault) + bool isDefault, + bool numaMemSupported) { virQEMUCapsAccelPtr accel = virQEMUCapsGetAccel(qemuCaps, virtType); virQEMUCapsMachineTypePtr mach; @@ -2764,6 +2789,8 @@ virQEMUCapsAddMachine(virQEMUCapsPtr qemuCaps, mach->hotplugCpus = hotplugCpus; mach->qemuDefault = isDefault; + + mach->numaMemSupported = numaMemSupported; } /** @@ -2809,7 +2836,8 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, machines[i]->defaultCPU, machines[i]->maxCpus, machines[i]->hotplugCpus, - machines[i]->isDefault); + machines[i]->isDefault, + machines[i]->numaMemSupported); if (preferredMachine && (STREQ_NULLABLE(machines[i]->alias, preferredMachine) || @@ -4028,6 +4056,11 @@ virQEMUCapsLoadMachines(virQEMUCapsAccelPtr caps, caps->machineTypes[i].qemuDefault = true; VIR_FREE(str); + str = virXMLPropString(nodes[i], "numaMemSupported"); + if (STREQ_NULLABLE(str, "yes")) + caps->machineTypes[i].numaMemSupported = true; + VIR_FREE(str); + caps->machineTypes[i].defaultCPU = virXMLPropString(nodes[i], "defaultCPU"); } @@ -4148,7 +4181,7 @@ virQEMUCapsParseSEVInfo(virQEMUCapsPtr qemuCaps, xmlXPathContextPtr ctxt) * ... * <cpu name="pentium3"/> * ... - * <machine name="pc-1.0" alias="pc" hotplugCpus='yes' maxCpus="4" default="yes"/> + * <machine name='pc-1.0' alias='pc' hotplugCpus='yes' maxCpus='4' default='yes' numaMemSupported='yes'/> * ... * </qemuCaps> */ @@ -4484,6 +4517,8 @@ virQEMUCapsFormatMachines(virQEMUCapsAccelPtr caps, virBufferAddLit(buf, " default='yes'"); virBufferEscapeString(buf, " defaultCPU='%s'", caps->machineTypes[i].defaultCPU); + if (caps->machineTypes[i].numaMemSupported) + virBufferAddLit(buf, " numaMemSupported='yes'"); virBufferAddLit(buf, "/>\n"); } } @@ -6200,7 +6235,8 @@ virQEMUCapsStripMachineAliasesForVirtType(virQEMUCapsPtr qemuCaps, if (name) { virQEMUCapsAddMachine(qemuCaps, virtType, name, NULL, mach->defaultCPU, - mach->maxCpus, mach->hotplugCpus, mach->qemuDefault); + mach->maxCpus, mach->hotplugCpus, mach->qemuDefault, + mach->numaMemSupported); } } } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6bfc7386e3..076ecad0f7 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -671,6 +671,9 @@ bool virQEMUCapsGetMachineHotplugCpus(virQEMUCapsPtr qemuCaps, const char *virQEMUCapsGetMachineDefaultCPU(virQEMUCapsPtr qemuCaps, const char *name, virDomainVirtType type); +bool virQEMUCapsGetMachineNumaMemSupported(virQEMUCapsPtr qemuCaps, + virDomainVirtType virtType, + const char *name); void virQEMUCapsFilterByMachineType(virQEMUCapsPtr qemuCaps, virDomainVirtType virtType, diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index 9c2be24ada..4c053af195 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -119,4 +119,5 @@ virQEMUCapsAddMachine(virQEMUCapsPtr qemuCaps, const char *defaultCPU, int maxCpus, bool hotplugCpus, - bool isDefault); + bool isDefault, + bool numaMemSupported); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 2e35d94bda..8b6341f3ff 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1095,6 +1095,7 @@ struct _qemuMonitorMachineInfo { unsigned int maxCpus; bool hotplugCpus; char *defaultCPU; + bool numaMemSupported; }; int qemuMonitorGetMachines(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 505b31a78a..3770380a3a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5651,6 +5651,17 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, info->defaultCPU = g_strdup(tmp); } + + if (virJSONValueObjectHasKey(child, "numa-mem-supported")) { + if (virJSONValueObjectGetBoolean(child, "numa-mem-supported", &info->numaMemSupported) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("qemu-machines reply has malformed " + "'numa-mem-supported' data")); + goto cleanup; + } + } else { + info->numaMemSupported = true; + } } ret = n; diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index a4f6c3aa09..0b103f25dc 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -116,21 +116,21 @@ <cpu type='kvm' name='core2duo'/> <cpu type='kvm' name='phenom'/> <cpu type='kvm' name='qemu64'/> - <machine type='kvm' name='pc-i440fx-1.5' alias='pc' maxCpus='255' default='yes'/> - <machine type='kvm' name='pc-q35-1.4' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.5' alias='q35' maxCpus='255'/> - <machine type='kvm' name='isapc' maxCpus='1'/> - <machine type='kvm' name='pc-0.10' maxCpus='255'/> - <machine type='kvm' name='pc-0.11' maxCpus='255'/> - <machine type='kvm' name='pc-0.12' maxCpus='255'/> - <machine type='kvm' name='pc-0.13' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' maxCpus='255'/> - <machine type='kvm' name='pc-0.15' maxCpus='255'/> - <machine type='kvm' name='pc-1.0' maxCpus='255'/> - <machine type='kvm' name='pc-1.1' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' maxCpus='255'/> - <machine type='kvm' name='pc-1.3' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/> + <machine type='kvm' name='pc-i440fx-1.5' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.5' alias='q35' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/> <cpu type='tcg' name='Opteron_G5'/> <cpu type='tcg' name='Opteron_G4'/> <cpu type='tcg' name='Opteron_G3'/> @@ -155,19 +155,19 @@ <cpu type='tcg' name='core2duo'/> <cpu type='tcg' name='phenom'/> <cpu type='tcg' name='qemu64'/> - <machine type='tcg' name='pc-i440fx-1.5' alias='pc' maxCpus='255' default='yes'/> - <machine type='tcg' name='pc-q35-1.4' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.5' alias='q35' maxCpus='255'/> - <machine type='tcg' name='isapc' maxCpus='1'/> - <machine type='tcg' name='pc-0.10' maxCpus='255'/> - <machine type='tcg' name='pc-0.11' maxCpus='255'/> - <machine type='tcg' name='pc-0.12' maxCpus='255'/> - <machine type='tcg' name='pc-0.13' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' maxCpus='255'/> - <machine type='tcg' name='pc-0.15' maxCpus='255'/> - <machine type='tcg' name='pc-1.0' maxCpus='255'/> - <machine type='tcg' name='pc-1.1' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' maxCpus='255'/> - <machine type='tcg' name='pc-1.3' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/> + <machine type='tcg' name='pc-i440fx-1.5' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.5' alias='q35' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 9e5501bed9..0361f343ec 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -121,23 +121,23 @@ <cpu type='kvm' name='core2duo'/> <cpu type='kvm' name='phenom'/> <cpu type='kvm' name='qemu64'/> - <machine type='kvm' name='pc-i440fx-1.6' alias='pc' maxCpus='255' default='yes'/> - <machine type='kvm' name='pc-q35-1.4' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.5' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.6' alias='q35' maxCpus='255'/> - <machine type='kvm' name='isapc' maxCpus='1'/> - <machine type='kvm' name='pc-0.10' maxCpus='255'/> - <machine type='kvm' name='pc-0.11' maxCpus='255'/> - <machine type='kvm' name='pc-0.12' maxCpus='255'/> - <machine type='kvm' name='pc-0.13' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' maxCpus='255'/> - <machine type='kvm' name='pc-0.15' maxCpus='255'/> - <machine type='kvm' name='pc-1.0' maxCpus='255'/> - <machine type='kvm' name='pc-1.1' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' maxCpus='255'/> - <machine type='kvm' name='pc-1.3' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/> + <machine type='kvm' name='pc-i440fx-1.6' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.6' alias='q35' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/> <cpu type='tcg' name='Opteron_G5'/> <cpu type='tcg' name='Opteron_G4'/> <cpu type='tcg' name='Opteron_G3'/> @@ -162,21 +162,21 @@ <cpu type='tcg' name='core2duo'/> <cpu type='tcg' name='phenom'/> <cpu type='tcg' name='qemu64'/> - <machine type='tcg' name='pc-i440fx-1.6' alias='pc' maxCpus='255' default='yes'/> - <machine type='tcg' name='pc-q35-1.4' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.5' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.6' alias='q35' maxCpus='255'/> - <machine type='tcg' name='isapc' maxCpus='1'/> - <machine type='tcg' name='pc-0.10' maxCpus='255'/> - <machine type='tcg' name='pc-0.11' maxCpus='255'/> - <machine type='tcg' name='pc-0.12' maxCpus='255'/> - <machine type='tcg' name='pc-0.13' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' maxCpus='255'/> - <machine type='tcg' name='pc-0.15' maxCpus='255'/> - <machine type='tcg' name='pc-1.0' maxCpus='255'/> - <machine type='tcg' name='pc-1.1' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' maxCpus='255'/> - <machine type='tcg' name='pc-1.3' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/> + <machine type='tcg' name='pc-i440fx-1.6' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.6' alias='q35' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 28eb61b38c..439219fa2e 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -123,25 +123,25 @@ <cpu type='kvm' name='core2duo'/> <cpu type='kvm' name='phenom'/> <cpu type='kvm' name='qemu64'/> - <machine type='kvm' name='pc-i440fx-1.7' alias='pc' maxCpus='255' default='yes'/> - <machine type='kvm' name='pc-q35-1.4' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.5' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.6' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.7' alias='q35' maxCpus='255'/> - <machine type='kvm' name='isapc' maxCpus='1'/> - <machine type='kvm' name='pc-0.10' maxCpus='255'/> - <machine type='kvm' name='pc-0.11' maxCpus='255'/> - <machine type='kvm' name='pc-0.12' maxCpus='255'/> - <machine type='kvm' name='pc-0.13' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' maxCpus='255'/> - <machine type='kvm' name='pc-0.15' maxCpus='255'/> - <machine type='kvm' name='pc-1.0' maxCpus='255'/> - <machine type='kvm' name='pc-1.1' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' maxCpus='255'/> - <machine type='kvm' name='pc-1.3' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255'/> + <machine type='kvm' name='pc-i440fx-1.7' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.7' alias='q35' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/> <cpu type='tcg' name='Opteron_G5'/> <cpu type='tcg' name='Opteron_G4'/> <cpu type='tcg' name='Opteron_G3'/> @@ -166,23 +166,23 @@ <cpu type='tcg' name='core2duo'/> <cpu type='tcg' name='phenom'/> <cpu type='tcg' name='qemu64'/> - <machine type='tcg' name='pc-i440fx-1.7' alias='pc' maxCpus='255' default='yes'/> - <machine type='tcg' name='pc-q35-1.4' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.5' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.6' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.7' alias='q35' maxCpus='255'/> - <machine type='tcg' name='isapc' maxCpus='1'/> - <machine type='tcg' name='pc-0.10' maxCpus='255'/> - <machine type='tcg' name='pc-0.11' maxCpus='255'/> - <machine type='tcg' name='pc-0.12' maxCpus='255'/> - <machine type='tcg' name='pc-0.13' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' maxCpus='255'/> - <machine type='tcg' name='pc-0.15' maxCpus='255'/> - <machine type='tcg' name='pc-1.0' maxCpus='255'/> - <machine type='tcg' name='pc-1.1' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' maxCpus='255'/> - <machine type='tcg' name='pc-1.3' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255'/> + <machine type='tcg' name='pc-i440fx-1.7' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.7' alias='q35' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index cfe79fef46..050e3c7059 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -140,29 +140,29 @@ <cpu type='kvm' name='core2duo'/> <cpu type='kvm' name='phenom'/> <cpu type='kvm' name='qemu64'/> - <machine type='kvm' name='pc-i440fx-2.1' alias='pc' maxCpus='255' default='yes'/> - <machine type='kvm' name='pc-1.3' maxCpus='255'/> - <machine type='kvm' name='pc-0.12' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.6' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.5' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.7' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.1' alias='q35' maxCpus='255'/> - <machine type='kvm' name='pc-0.11' maxCpus='255'/> - <machine type='kvm' name='pc-0.10' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' maxCpus='255'/> - <machine type='kvm' name='isapc' maxCpus='1'/> - <machine type='kvm' name='pc-q35-1.4' maxCpus='255'/> - <machine type='kvm' name='pc-0.15' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.0' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' maxCpus='255'/> - <machine type='kvm' name='pc-1.1' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.7' maxCpus='255'/> - <machine type='kvm' name='pc-1.0' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.0' maxCpus='255'/> - <machine type='kvm' name='pc-0.13' maxCpus='255'/> + <machine type='kvm' name='pc-i440fx-2.1' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.1' alias='q35' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/> <cpu type='tcg' name='Opteron_G5'/> <cpu type='tcg' name='Opteron_G4'/> <cpu type='tcg' name='Opteron_G3'/> @@ -188,27 +188,27 @@ <cpu type='tcg' name='core2duo'/> <cpu type='tcg' name='phenom'/> <cpu type='tcg' name='qemu64'/> - <machine type='tcg' name='pc-i440fx-2.1' alias='pc' maxCpus='255' default='yes'/> - <machine type='tcg' name='pc-1.3' maxCpus='255'/> - <machine type='tcg' name='pc-0.12' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.6' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.5' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.7' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.1' alias='q35' maxCpus='255'/> - <machine type='tcg' name='pc-0.11' maxCpus='255'/> - <machine type='tcg' name='pc-0.10' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' maxCpus='255'/> - <machine type='tcg' name='isapc' maxCpus='1'/> - <machine type='tcg' name='pc-q35-1.4' maxCpus='255'/> - <machine type='tcg' name='pc-0.15' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.0' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' maxCpus='255'/> - <machine type='tcg' name='pc-1.1' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.7' maxCpus='255'/> - <machine type='tcg' name='pc-1.0' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.0' maxCpus='255'/> - <machine type='tcg' name='pc-0.13' maxCpus='255'/> + <machine type='tcg' name='pc-i440fx-2.1' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.1' alias='q35' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index cfa1962e98..db8a298873 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -179,57 +179,57 @@ <cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/> <cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/> <cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/> - <machine type='kvm' name='integratorcp' maxCpus='1'/> - <machine type='kvm' name='nuri' maxCpus='2'/> - <machine type='kvm' name='mps2-an511' maxCpus='1'/> - <machine type='kvm' name='verdex' maxCpus='1'/> - <machine type='kvm' name='ast2500-evb' maxCpus='1'/> - <machine type='kvm' name='smdkc210' maxCpus='2'/> - <machine type='kvm' name='collie' maxCpus='1'/> - <machine type='kvm' name='imx25-pdk' maxCpus='1'/> - <machine type='kvm' name='spitz' maxCpus='1'/> - <machine type='kvm' name='realview-pbx-a9' maxCpus='4'/> - <machine type='kvm' name='realview-eb' maxCpus='1'/> - <machine type='kvm' name='versatilepb' maxCpus='1'/> - <machine type='kvm' name='realview-pb-a8' maxCpus='1'/> - <machine type='kvm' name='virt-2.9' maxCpus='255'/> - <machine type='kvm' name='musicpal' maxCpus='1'/> - <machine type='kvm' name='z2' maxCpus='1'/> - <machine type='kvm' name='akita' maxCpus='1'/> - <machine type='kvm' name='virt-2.7' maxCpus='255'/> - <machine type='kvm' name='kzm' maxCpus='1'/> - <machine type='kvm' name='virt-2.8' maxCpus='255'/> - <machine type='kvm' name='realview-eb-mpcore' maxCpus='4'/> - <machine type='kvm' name='sx1' maxCpus='1'/> - <machine type='kvm' name='sx1-v1' maxCpus='1'/> - <machine type='kvm' name='virt-2.6' maxCpus='255'/> - <machine type='kvm' name='cubieboard' maxCpus='1'/> - <machine type='kvm' name='highbank' maxCpus='4'/> - <machine type='kvm' name='raspi2' maxCpus='4'/> - <machine type='kvm' name='netduino2' maxCpus='1'/> - <machine type='kvm' name='terrier' maxCpus='1'/> - <machine type='kvm' name='n810' maxCpus='1'/> - <machine type='kvm' name='mainstone' maxCpus='1'/> - <machine type='kvm' name='palmetto-bmc' maxCpus='1'/> - <machine type='kvm' name='sabrelite' maxCpus='4'/> - <machine type='kvm' name='midway' maxCpus='4'/> - <machine type='kvm' name='romulus-bmc' maxCpus='1'/> - <machine type='kvm' name='cheetah' maxCpus='1'/> - <machine type='kvm' name='tosa' maxCpus='1'/> - <machine type='kvm' name='borzoi' maxCpus='1'/> - <machine type='kvm' name='versatileab' maxCpus='1'/> - <machine type='kvm' name='lm3s6965evb' maxCpus='1'/> - <machine type='kvm' name='n800' maxCpus='1'/> - <machine type='kvm' name='virt-2.10' alias='virt' maxCpus='255'/> - <machine type='kvm' name='connex' maxCpus='1'/> - <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1'/> - <machine type='kvm' name='xlnx-ep108' maxCpus='1'/> - <machine type='kvm' name='mps2-an385' maxCpus='1'/> - <machine type='kvm' name='vexpress-a9' maxCpus='4'/> - <machine type='kvm' name='vexpress-a15' maxCpus='4'/> - <machine type='kvm' name='xlnx-zcu102' maxCpus='1'/> - <machine type='kvm' name='canon-a1100' maxCpus='1'/> - <machine type='kvm' name='lm3s811evb' maxCpus='1'/> + <machine type='kvm' name='integratorcp' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='nuri' maxCpus='2' numaMemSupported='yes'/> + <machine type='kvm' name='mps2-an511' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='verdex' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='ast2500-evb' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='smdkc210' maxCpus='2' numaMemSupported='yes'/> + <machine type='kvm' name='collie' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='imx25-pdk' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='spitz' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='realview-pbx-a9' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='realview-eb' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='versatilepb' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='realview-pb-a8' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.9' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='musicpal' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='z2' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='akita' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='kzm' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.8' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='realview-eb-mpcore' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='sx1' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='sx1-v1' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='cubieboard' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='highbank' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='raspi2' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='netduino2' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='terrier' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='n810' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='mainstone' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='palmetto-bmc' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='sabrelite' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='midway' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='romulus-bmc' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='cheetah' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='tosa' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='borzoi' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='versatileab' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='lm3s6965evb' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='n800' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.10' alias='virt' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='connex' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='xlnx-ep108' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='mps2-an385' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='vexpress-a9' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='vexpress-a15' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='xlnx-zcu102' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='canon-a1100' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='lm3s811evb' maxCpus='1' numaMemSupported='yes'/> <cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/> <cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/> <cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/> @@ -261,57 +261,57 @@ <cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/> <cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/> <cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/> - <machine type='tcg' name='integratorcp' maxCpus='1'/> - <machine type='tcg' name='nuri' maxCpus='2'/> - <machine type='tcg' name='mps2-an511' maxCpus='1'/> - <machine type='tcg' name='verdex' maxCpus='1'/> - <machine type='tcg' name='ast2500-evb' maxCpus='1'/> - <machine type='tcg' name='smdkc210' maxCpus='2'/> - <machine type='tcg' name='collie' maxCpus='1'/> - <machine type='tcg' name='imx25-pdk' maxCpus='1'/> - <machine type='tcg' name='spitz' maxCpus='1'/> - <machine type='tcg' name='realview-pbx-a9' maxCpus='4'/> - <machine type='tcg' name='realview-eb' maxCpus='1'/> - <machine type='tcg' name='versatilepb' maxCpus='1'/> - <machine type='tcg' name='realview-pb-a8' maxCpus='1'/> - <machine type='tcg' name='virt-2.9' maxCpus='255'/> - <machine type='tcg' name='musicpal' maxCpus='1'/> - <machine type='tcg' name='z2' maxCpus='1'/> - <machine type='tcg' name='akita' maxCpus='1'/> - <machine type='tcg' name='virt-2.7' maxCpus='255'/> - <machine type='tcg' name='kzm' maxCpus='1'/> - <machine type='tcg' name='virt-2.8' maxCpus='255'/> - <machine type='tcg' name='realview-eb-mpcore' maxCpus='4'/> - <machine type='tcg' name='sx1' maxCpus='1'/> - <machine type='tcg' name='sx1-v1' maxCpus='1'/> - <machine type='tcg' name='virt-2.6' maxCpus='255'/> - <machine type='tcg' name='cubieboard' maxCpus='1'/> - <machine type='tcg' name='highbank' maxCpus='4'/> - <machine type='tcg' name='raspi2' maxCpus='4'/> - <machine type='tcg' name='netduino2' maxCpus='1'/> - <machine type='tcg' name='terrier' maxCpus='1'/> - <machine type='tcg' name='n810' maxCpus='1'/> - <machine type='tcg' name='mainstone' maxCpus='1'/> - <machine type='tcg' name='palmetto-bmc' maxCpus='1'/> - <machine type='tcg' name='sabrelite' maxCpus='4'/> - <machine type='tcg' name='midway' maxCpus='4'/> - <machine type='tcg' name='romulus-bmc' maxCpus='1'/> - <machine type='tcg' name='cheetah' maxCpus='1'/> - <machine type='tcg' name='tosa' maxCpus='1'/> - <machine type='tcg' name='borzoi' maxCpus='1'/> - <machine type='tcg' name='versatileab' maxCpus='1'/> - <machine type='tcg' name='lm3s6965evb' maxCpus='1'/> - <machine type='tcg' name='n800' maxCpus='1'/> - <machine type='tcg' name='virt-2.10' alias='virt' maxCpus='255'/> - <machine type='tcg' name='connex' maxCpus='1'/> - <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1'/> - <machine type='tcg' name='xlnx-ep108' maxCpus='1'/> - <machine type='tcg' name='mps2-an385' maxCpus='1'/> - <machine type='tcg' name='vexpress-a9' maxCpus='4'/> - <machine type='tcg' name='vexpress-a15' maxCpus='4'/> - <machine type='tcg' name='xlnx-zcu102' maxCpus='1'/> - <machine type='tcg' name='canon-a1100' maxCpus='1'/> - <machine type='tcg' name='lm3s811evb' maxCpus='1'/> + <machine type='tcg' name='integratorcp' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='nuri' maxCpus='2' numaMemSupported='yes'/> + <machine type='tcg' name='mps2-an511' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='verdex' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='ast2500-evb' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='smdkc210' maxCpus='2' numaMemSupported='yes'/> + <machine type='tcg' name='collie' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='imx25-pdk' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='spitz' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='realview-pbx-a9' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='realview-eb' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='versatilepb' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='realview-pb-a8' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.9' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='musicpal' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='z2' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='akita' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='kzm' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.8' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='realview-eb-mpcore' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='sx1' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='sx1-v1' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='cubieboard' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='highbank' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='raspi2' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='netduino2' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='terrier' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='n810' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='mainstone' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='palmetto-bmc' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='sabrelite' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='midway' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='romulus-bmc' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='cheetah' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='tosa' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='borzoi' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='versatileab' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='lm3s6965evb' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='n800' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.10' alias='virt' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='connex' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='xlnx-ep108' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='mps2-an385' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='vexpress-a9' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='vexpress-a15' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='xlnx-zcu102' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='canon-a1100' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='lm3s811evb' maxCpus='1' numaMemSupported='yes'/> <gic version='3' kernel='no' emulated='yes'/> <gic version='2' kernel='yes' emulated='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 0eee26c3ac..15e8933300 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -581,27 +581,27 @@ <cpu type='kvm' name='MPC8544E_v11'/> <cpu type='kvm' name='405GPb'/> <cpu type='kvm' name='MPC8541E_v11'/> - <machine type='kvm' name='pseries-2.10' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/> - <machine type='kvm' name='ref405ep' maxCpus='1'/> - <machine type='kvm' name='virtex-ml507' maxCpus='1'/> - <machine type='kvm' name='powernv' maxCpus='2048'/> - <machine type='kvm' name='ppce500' maxCpus='32'/> - <machine type='kvm' name='mpc8544ds' maxCpus='15'/> - <machine type='kvm' name='bamboo' maxCpus='1'/> - <machine type='kvm' name='g3beige' maxCpus='1'/> - <machine type='kvm' name='prep' maxCpus='1'/> - <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='mac99' maxCpus='1'/> - <machine type='kvm' name='pseries-2.6' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.4' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.5' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.2' maxCpus='1024'/> - <machine type='kvm' name='taihu' maxCpus='1'/> - <machine type='kvm' name='pseries-2.3' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.1' maxCpus='1024'/> - <machine type='kvm' name='40p' maxCpus='1'/> + <machine type='kvm' name='pseries-2.10' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='ref405ep' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='powernv' maxCpus='2048' numaMemSupported='yes'/> + <machine type='kvm' name='ppce500' maxCpus='32' numaMemSupported='yes'/> + <machine type='kvm' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/> + <machine type='kvm' name='bamboo' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='g3beige' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='prep' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='mac99' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='taihu' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='40p' maxCpus='1' numaMemSupported='yes'/> <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/> <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/> <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/> @@ -1035,25 +1035,25 @@ <cpu type='tcg' name='MPC8544E_v11'/> <cpu type='tcg' name='405GPb'/> <cpu type='tcg' name='MPC8541E_v11'/> - <machine type='tcg' name='pseries-2.10' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/> - <machine type='tcg' name='ref405ep' maxCpus='1'/> - <machine type='tcg' name='virtex-ml507' maxCpus='1'/> - <machine type='tcg' name='powernv' maxCpus='2048'/> - <machine type='tcg' name='ppce500' maxCpus='32'/> - <machine type='tcg' name='mpc8544ds' maxCpus='15'/> - <machine type='tcg' name='bamboo' maxCpus='1'/> - <machine type='tcg' name='g3beige' maxCpus='1'/> - <machine type='tcg' name='prep' maxCpus='1'/> - <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='mac99' maxCpus='1'/> - <machine type='tcg' name='pseries-2.6' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.4' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.5' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.2' maxCpus='1024'/> - <machine type='tcg' name='taihu' maxCpus='1'/> - <machine type='tcg' name='pseries-2.3' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.1' maxCpus='1024'/> - <machine type='tcg' name='40p' maxCpus='1'/> + <machine type='tcg' name='pseries-2.10' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='ref405ep' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='powernv' maxCpus='2048' numaMemSupported='yes'/> + <machine type='tcg' name='ppce500' maxCpus='32' numaMemSupported='yes'/> + <machine type='tcg' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/> + <machine type='tcg' name='bamboo' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='g3beige' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='prep' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='mac99' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='taihu' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='40p' maxCpus='1' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 7b14f7c209..90c42cdf4f 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -210,13 +210,13 @@ <cpu type='kvm' name='z196-base' typename='z196-base-s390-cpu' usable='yes'/> <cpu type='kvm' name='z13-base' typename='z13-base-s390-cpu' usable='yes'/> <cpu type='kvm' name='z890' typename='z890-s390-cpu' usable='yes'/> - <machine type='kvm' name='s390-ccw-virtio-2.10' alias='s390-ccw-virtio' maxCpus='248' default='yes'/> - <machine type='kvm' name='s390-ccw-virtio-2.7' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.9' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.8' maxCpus='248'/> + <machine type='kvm' name='s390-ccw-virtio-2.10' alias='s390-ccw-virtio' maxCpus='248' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.7' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.9' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.8' maxCpus='248' numaMemSupported='yes'/> <cpu type='tcg' name='z10EC-base' typename='z10EC-base-s390-cpu' usable='no'> <blocker name='dateh2'/> <blocker name='pfpo'/> @@ -1261,11 +1261,11 @@ <blocker name='msa'/> <blocker name='type'/> </cpu> - <machine type='tcg' name='s390-ccw-virtio-2.10' alias='s390-ccw-virtio' maxCpus='248' default='yes'/> - <machine type='tcg' name='s390-ccw-virtio-2.7' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.9' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.8' maxCpus='248'/> + <machine type='tcg' name='s390-ccw-virtio-2.10' alias='s390-ccw-virtio' maxCpus='248' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.7' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.9' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.8' maxCpus='248' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 205a0675db..cb02723ada 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -532,41 +532,41 @@ <blocker name='3dnowprefetch'/> </cpu> <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='kvm' name='pc-i440fx-2.10' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='xenpv' maxCpus='1'/> - <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='xenfv' hotplugCpus='yes' maxCpus='128'/> - <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.10' alias='q35' hotplugCpus='yes' maxCpus='288'/> + <machine type='kvm' name='pc-i440fx-2.10' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='xenpv' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='xenfv' hotplugCpus='yes' maxCpus='128' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.10' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> <hostCPU type='tcg' model='base' migratability='yes'> <property name='phys-bits' type='number' value='0'/> <property name='core-id' type='number' value='-1'/> @@ -949,39 +949,39 @@ <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='tcg' name='pc-i440fx-2.10' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='xenpv' maxCpus='1'/> - <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='xenfv' hotplugCpus='yes' maxCpus='128'/> - <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.10' alias='q35' hotplugCpus='yes' maxCpus='288'/> + <machine type='tcg' name='pc-i440fx-2.10' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='xenpv' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='xenfv' hotplugCpus='yes' maxCpus='128' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.10' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index ec8723f045..d27f656ae0 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -216,14 +216,14 @@ <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/> - <machine type='kvm' name='s390-ccw-virtio-2.11' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/> - <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/> + <machine type='kvm' name='s390-ccw-virtio-2.11' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> <cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'> <blocker name='klmd-sha-1'/> <blocker name='kimd-sha-1'/> @@ -2607,12 +2607,12 @@ <blocker name='hfpm'/> <blocker name='type'/> </cpu> - <machine type='tcg' name='s390-ccw-virtio-2.11' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/> - <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/> + <machine type='tcg' name='s390-ccw-virtio-2.11' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 15f59774f3..5245fc77dc 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -509,41 +509,41 @@ <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='kvm' name='pc-i440fx-2.11' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.11' alias='q35' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> + <machine type='kvm' name='pc-i440fx-2.11' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.11' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> <hostCPU type='tcg' model='base' migratability='yes'> <property name='phys-bits' type='number' value='0'/> <property name='core-id' type='number' value='-1'/> @@ -942,39 +942,39 @@ <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='tcg' name='pc-i440fx-2.11' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.11' alias='q35' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> + <machine type='tcg' name='pc-i440fx-2.11' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.11' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 94a0344b1a..38d36400e4 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -197,63 +197,63 @@ <cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/> <cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/> <cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/> - <machine type='kvm' name='integratorcp' maxCpus='1'/> - <machine type='kvm' name='nuri' maxCpus='2'/> - <machine type='kvm' name='mps2-an511' maxCpus='1'/> - <machine type='kvm' name='verdex' maxCpus='1'/> - <machine type='kvm' name='mps2-an505' maxCpus='1'/> - <machine type='kvm' name='ast2500-evb' maxCpus='1'/> - <machine type='kvm' name='smdkc210' maxCpus='2'/> - <machine type='kvm' name='collie' maxCpus='1'/> - <machine type='kvm' name='imx25-pdk' maxCpus='1'/> - <machine type='kvm' name='spitz' maxCpus='1'/> - <machine type='kvm' name='realview-pbx-a9' maxCpus='4'/> - <machine type='kvm' name='realview-eb' maxCpus='1'/> - <machine type='kvm' name='realview-pb-a8' maxCpus='1'/> - <machine type='kvm' name='versatilepb' maxCpus='1'/> - <machine type='kvm' name='emcraft-sf2' maxCpus='1'/> - <machine type='kvm' name='virt-2.9' maxCpus='255'/> - <machine type='kvm' name='musicpal' maxCpus='1'/> - <machine type='kvm' name='z2' maxCpus='1'/> - <machine type='kvm' name='akita' maxCpus='1'/> - <machine type='kvm' name='virt-2.7' maxCpus='255'/> - <machine type='kvm' name='kzm' maxCpus='1'/> - <machine type='kvm' name='virt-2.8' maxCpus='255'/> - <machine type='kvm' name='realview-eb-mpcore' maxCpus='4'/> - <machine type='kvm' name='mcimx7d-sabre' maxCpus='2'/> - <machine type='kvm' name='sx1' maxCpus='1'/> - <machine type='kvm' name='sx1-v1' maxCpus='1'/> - <machine type='kvm' name='virt-2.6' maxCpus='255'/> - <machine type='kvm' name='cubieboard' maxCpus='1'/> - <machine type='kvm' name='highbank' maxCpus='4'/> - <machine type='kvm' name='raspi2' maxCpus='4'/> - <machine type='kvm' name='raspi3' maxCpus='4'/> - <machine type='kvm' name='netduino2' maxCpus='1'/> - <machine type='kvm' name='terrier' maxCpus='1'/> - <machine type='kvm' name='n810' maxCpus='1'/> - <machine type='kvm' name='mainstone' maxCpus='1'/> - <machine type='kvm' name='palmetto-bmc' maxCpus='1'/> - <machine type='kvm' name='sabrelite' maxCpus='4'/> - <machine type='kvm' name='midway' maxCpus='4'/> - <machine type='kvm' name='romulus-bmc' maxCpus='1'/> - <machine type='kvm' name='cheetah' maxCpus='1'/> - <machine type='kvm' name='tosa' maxCpus='1'/> - <machine type='kvm' name='borzoi' maxCpus='1'/> - <machine type='kvm' name='versatileab' maxCpus='1'/> - <machine type='kvm' name='lm3s6965evb' maxCpus='1'/> - <machine type='kvm' name='n800' maxCpus='1'/> - <machine type='kvm' name='virt-2.10' maxCpus='255'/> - <machine type='kvm' name='virt-2.11' maxCpus='255'/> - <machine type='kvm' name='connex' maxCpus='1'/> - <machine type='kvm' name='virt-2.12' alias='virt' maxCpus='255'/> - <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1'/> - <machine type='kvm' name='xlnx-ep108' maxCpus='6'/> - <machine type='kvm' name='mps2-an385' maxCpus='1'/> - <machine type='kvm' name='vexpress-a9' maxCpus='4'/> - <machine type='kvm' name='vexpress-a15' maxCpus='4'/> - <machine type='kvm' name='xlnx-zcu102' maxCpus='6'/> - <machine type='kvm' name='canon-a1100' maxCpus='1'/> - <machine type='kvm' name='lm3s811evb' maxCpus='1'/> + <machine type='kvm' name='integratorcp' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='nuri' maxCpus='2' numaMemSupported='yes'/> + <machine type='kvm' name='mps2-an511' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='verdex' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='mps2-an505' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='ast2500-evb' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='smdkc210' maxCpus='2' numaMemSupported='yes'/> + <machine type='kvm' name='collie' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='imx25-pdk' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='spitz' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='realview-pbx-a9' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='realview-eb' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='realview-pb-a8' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='versatilepb' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='emcraft-sf2' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.9' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='musicpal' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='z2' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='akita' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='kzm' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.8' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='realview-eb-mpcore' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='mcimx7d-sabre' maxCpus='2' numaMemSupported='yes'/> + <machine type='kvm' name='sx1' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='sx1-v1' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='cubieboard' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='highbank' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='raspi2' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='raspi3' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='netduino2' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='terrier' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='n810' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='mainstone' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='palmetto-bmc' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='sabrelite' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='midway' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='romulus-bmc' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='cheetah' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='tosa' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='borzoi' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='versatileab' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='lm3s6965evb' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='n800' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='connex' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.12' alias='virt' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='xlnx-ep108' maxCpus='6' numaMemSupported='yes'/> + <machine type='kvm' name='mps2-an385' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='vexpress-a9' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='vexpress-a15' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='xlnx-zcu102' maxCpus='6' numaMemSupported='yes'/> + <machine type='kvm' name='canon-a1100' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='lm3s811evb' maxCpus='1' numaMemSupported='yes'/> <cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/> <cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/> <cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/> @@ -288,63 +288,63 @@ <cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/> <cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/> <cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/> - <machine type='tcg' name='integratorcp' maxCpus='1'/> - <machine type='tcg' name='nuri' maxCpus='2'/> - <machine type='tcg' name='mps2-an511' maxCpus='1'/> - <machine type='tcg' name='verdex' maxCpus='1'/> - <machine type='tcg' name='mps2-an505' maxCpus='1'/> - <machine type='tcg' name='ast2500-evb' maxCpus='1'/> - <machine type='tcg' name='smdkc210' maxCpus='2'/> - <machine type='tcg' name='collie' maxCpus='1'/> - <machine type='tcg' name='imx25-pdk' maxCpus='1'/> - <machine type='tcg' name='spitz' maxCpus='1'/> - <machine type='tcg' name='realview-pbx-a9' maxCpus='4'/> - <machine type='tcg' name='realview-eb' maxCpus='1'/> - <machine type='tcg' name='realview-pb-a8' maxCpus='1'/> - <machine type='tcg' name='versatilepb' maxCpus='1'/> - <machine type='tcg' name='emcraft-sf2' maxCpus='1'/> - <machine type='tcg' name='virt-2.9' maxCpus='255'/> - <machine type='tcg' name='musicpal' maxCpus='1'/> - <machine type='tcg' name='z2' maxCpus='1'/> - <machine type='tcg' name='akita' maxCpus='1'/> - <machine type='tcg' name='virt-2.7' maxCpus='255'/> - <machine type='tcg' name='kzm' maxCpus='1'/> - <machine type='tcg' name='virt-2.8' maxCpus='255'/> - <machine type='tcg' name='realview-eb-mpcore' maxCpus='4'/> - <machine type='tcg' name='mcimx7d-sabre' maxCpus='2'/> - <machine type='tcg' name='sx1' maxCpus='1'/> - <machine type='tcg' name='sx1-v1' maxCpus='1'/> - <machine type='tcg' name='virt-2.6' maxCpus='255'/> - <machine type='tcg' name='cubieboard' maxCpus='1'/> - <machine type='tcg' name='highbank' maxCpus='4'/> - <machine type='tcg' name='raspi2' maxCpus='4'/> - <machine type='tcg' name='raspi3' maxCpus='4'/> - <machine type='tcg' name='netduino2' maxCpus='1'/> - <machine type='tcg' name='terrier' maxCpus='1'/> - <machine type='tcg' name='n810' maxCpus='1'/> - <machine type='tcg' name='mainstone' maxCpus='1'/> - <machine type='tcg' name='palmetto-bmc' maxCpus='1'/> - <machine type='tcg' name='sabrelite' maxCpus='4'/> - <machine type='tcg' name='midway' maxCpus='4'/> - <machine type='tcg' name='romulus-bmc' maxCpus='1'/> - <machine type='tcg' name='cheetah' maxCpus='1'/> - <machine type='tcg' name='tosa' maxCpus='1'/> - <machine type='tcg' name='borzoi' maxCpus='1'/> - <machine type='tcg' name='versatileab' maxCpus='1'/> - <machine type='tcg' name='lm3s6965evb' maxCpus='1'/> - <machine type='tcg' name='n800' maxCpus='1'/> - <machine type='tcg' name='virt-2.10' maxCpus='255'/> - <machine type='tcg' name='virt-2.11' maxCpus='255'/> - <machine type='tcg' name='connex' maxCpus='1'/> - <machine type='tcg' name='virt-2.12' alias='virt' maxCpus='255'/> - <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1'/> - <machine type='tcg' name='xlnx-ep108' maxCpus='6'/> - <machine type='tcg' name='mps2-an385' maxCpus='1'/> - <machine type='tcg' name='vexpress-a9' maxCpus='4'/> - <machine type='tcg' name='vexpress-a15' maxCpus='4'/> - <machine type='tcg' name='xlnx-zcu102' maxCpus='6'/> - <machine type='tcg' name='canon-a1100' maxCpus='1'/> - <machine type='tcg' name='lm3s811evb' maxCpus='1'/> + <machine type='tcg' name='integratorcp' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='nuri' maxCpus='2' numaMemSupported='yes'/> + <machine type='tcg' name='mps2-an511' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='verdex' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='mps2-an505' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='ast2500-evb' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='smdkc210' maxCpus='2' numaMemSupported='yes'/> + <machine type='tcg' name='collie' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='imx25-pdk' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='spitz' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='realview-pbx-a9' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='realview-eb' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='realview-pb-a8' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='versatilepb' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='emcraft-sf2' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.9' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='musicpal' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='z2' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='akita' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='kzm' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.8' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='realview-eb-mpcore' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='mcimx7d-sabre' maxCpus='2' numaMemSupported='yes'/> + <machine type='tcg' name='sx1' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='sx1-v1' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='cubieboard' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='highbank' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='raspi2' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='raspi3' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='netduino2' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='terrier' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='n810' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='mainstone' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='palmetto-bmc' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='sabrelite' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='midway' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='romulus-bmc' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='cheetah' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='tosa' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='borzoi' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='versatileab' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='lm3s6965evb' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='n800' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='connex' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.12' alias='virt' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='xlnx-ep108' maxCpus='6' numaMemSupported='yes'/> + <machine type='tcg' name='mps2-an385' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='vexpress-a9' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='vexpress-a15' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='xlnx-zcu102' maxCpus='6' numaMemSupported='yes'/> + <machine type='tcg' name='canon-a1100' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='lm3s811evb' maxCpus='1' numaMemSupported='yes'/> <gic version='3' kernel='yes' emulated='yes'/> <gic version='2' kernel='no' emulated='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 3bf0e20c9b..53abf2debb 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -602,31 +602,31 @@ <cpu type='kvm' name='750_v3.1'/> <cpu type='kvm' name='power8e_v2.1'/> <cpu type='kvm' name='mpc8568e'/> - <machine type='kvm' name='pseries-2.12' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/> - <machine type='kvm' name='ref405ep' maxCpus='1'/> - <machine type='kvm' name='sam460ex' maxCpus='1'/> - <machine type='kvm' name='virtex-ml507' maxCpus='1'/> - <machine type='kvm' name='powernv' maxCpus='2048'/> - <machine type='kvm' name='ppce500' maxCpus='32'/> - <machine type='kvm' name='mpc8544ds' maxCpus='15'/> - <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='bamboo' maxCpus='1'/> - <machine type='kvm' name='g3beige' maxCpus='1'/> - <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='prep' maxCpus='1'/> - <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='mac99' maxCpus='1'/> - <machine type='kvm' name='pseries-2.6' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.4' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.5' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.2' maxCpus='1024'/> - <machine type='kvm' name='taihu' maxCpus='1'/> - <machine type='kvm' name='pseries-2.3' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.1' maxCpus='1024'/> - <machine type='kvm' name='40p' maxCpus='1'/> + <machine type='kvm' name='pseries-2.12' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='ref405ep' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='sam460ex' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='powernv' maxCpus='2048' numaMemSupported='yes'/> + <machine type='kvm' name='ppce500' maxCpus='32' numaMemSupported='yes'/> + <machine type='kvm' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='bamboo' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='g3beige' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='prep' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='mac99' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='taihu' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='40p' maxCpus='1' numaMemSupported='yes'/> <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/> <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/> <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/> @@ -1064,29 +1064,29 @@ <cpu type='tcg' name='750_v3.1'/> <cpu type='tcg' name='power8e_v2.1'/> <cpu type='tcg' name='mpc8568e'/> - <machine type='tcg' name='pseries-2.12' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/> - <machine type='tcg' name='ref405ep' maxCpus='1'/> - <machine type='tcg' name='sam460ex' maxCpus='1'/> - <machine type='tcg' name='virtex-ml507' maxCpus='1'/> - <machine type='tcg' name='powernv' maxCpus='2048'/> - <machine type='tcg' name='ppce500' maxCpus='32'/> - <machine type='tcg' name='mpc8544ds' maxCpus='15'/> - <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='bamboo' maxCpus='1'/> - <machine type='tcg' name='g3beige' maxCpus='1'/> - <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='prep' maxCpus='1'/> - <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='mac99' maxCpus='1'/> - <machine type='tcg' name='pseries-2.6' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.4' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.5' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.2' maxCpus='1024'/> - <machine type='tcg' name='taihu' maxCpus='1'/> - <machine type='tcg' name='pseries-2.3' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.1' maxCpus='1024'/> - <machine type='tcg' name='40p' maxCpus='1'/> + <machine type='tcg' name='pseries-2.12' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='ref405ep' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='sam460ex' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='powernv' maxCpus='2048' numaMemSupported='yes'/> + <machine type='tcg' name='ppce500' maxCpus='32' numaMemSupported='yes'/> + <machine type='tcg' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='bamboo' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='g3beige' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='prep' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='mac99' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='taihu' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='40p' maxCpus='1' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 8be663c96d..880e5f137a 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -229,15 +229,15 @@ <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/> - <machine type='kvm' name='s390-ccw-virtio-2.12' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/> - <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/> + <machine type='kvm' name='s390-ccw-virtio-2.12' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> <cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'> <blocker name='klmd-sha-1'/> <blocker name='kimd-sha-1'/> @@ -2477,13 +2477,13 @@ <blocker name='kmac-dea'/> <blocker name='hfpm'/> </cpu> - <machine type='tcg' name='s390-ccw-virtio-2.12' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/> - <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/> + <machine type='tcg' name='s390-ccw-virtio-2.12' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index c249525547..319dd6f2c3 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -666,43 +666,43 @@ <blocker name='3dnowprefetch'/> </cpu> <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='kvm' name='pc-i440fx-2.12' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-q35-2.12' alias='q35' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> + <machine type='kvm' name='pc-i440fx-2.12' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.12' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> <hostCPU type='tcg' model='base' migratability='yes'> <property name='phys-bits' type='number' value='0'/> <property name='core-id' type='number' value='-1'/> @@ -1241,43 +1241,43 @@ <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='tcg' name='pc-i440fx-2.12' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-q35-2.12' alias='q35' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> + <machine type='tcg' name='pc-i440fx-2.12' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.12' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> <sev> <cbitpos>47</cbitpos> <reducedPhysBits>1</reducedPhysBits> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 6eebad8b03..7f0fe3b9aa 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -169,35 +169,35 @@ <cpu type='kvm' name='core2duo'/> <cpu type='kvm' name='phenom'/> <cpu type='kvm' name='qemu64'/> - <machine type='kvm' name='pc-i440fx-2.4' alias='pc' maxCpus='255' default='yes'/> - <machine type='kvm' name='pc-1.3' maxCpus='255'/> - <machine type='kvm' name='pc-0.12' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.6' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.5' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.2' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.7' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.1' maxCpus='255'/> - <machine type='kvm' name='pc-0.11' maxCpus='255'/> - <machine type='kvm' name='pc-0.10' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.2' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' maxCpus='255'/> - <machine type='kvm' name='isapc' maxCpus='1'/> - <machine type='kvm' name='pc-i440fx-2.3' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.4' maxCpus='255'/> - <machine type='kvm' name='pc-0.15' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.0' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' maxCpus='255'/> - <machine type='kvm' name='pc-1.1' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.1' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.7' maxCpus='255'/> - <machine type='kvm' name='pc-1.0' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.0' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.4' alias='q35' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.3' maxCpus='255'/> - <machine type='kvm' name='pc-0.13' maxCpus='255'/> + <machine type='kvm' name='pc-i440fx-2.4' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.4' alias='q35' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/> <cpu type='tcg' name='Opteron_G5'/> <cpu type='tcg' name='Opteron_G4'/> <cpu type='tcg' name='Opteron_G3'/> @@ -226,33 +226,33 @@ <cpu type='tcg' name='core2duo'/> <cpu type='tcg' name='phenom'/> <cpu type='tcg' name='qemu64'/> - <machine type='tcg' name='pc-i440fx-2.4' alias='pc' maxCpus='255' default='yes'/> - <machine type='tcg' name='pc-1.3' maxCpus='255'/> - <machine type='tcg' name='pc-0.12' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.6' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.5' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.2' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.7' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.1' maxCpus='255'/> - <machine type='tcg' name='pc-0.11' maxCpus='255'/> - <machine type='tcg' name='pc-0.10' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.2' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' maxCpus='255'/> - <machine type='tcg' name='isapc' maxCpus='1'/> - <machine type='tcg' name='pc-i440fx-2.3' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.4' maxCpus='255'/> - <machine type='tcg' name='pc-0.15' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.0' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' maxCpus='255'/> - <machine type='tcg' name='pc-1.1' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.1' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.7' maxCpus='255'/> - <machine type='tcg' name='pc-1.0' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.0' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.4' alias='q35' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.3' maxCpus='255'/> - <machine type='tcg' name='pc-0.13' maxCpus='255'/> + <machine type='tcg' name='pc-i440fx-2.4' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.4' alias='q35' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 662140e657..efb4ffa019 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -175,37 +175,37 @@ <cpu type='kvm' name='core2duo'/> <cpu type='kvm' name='phenom'/> <cpu type='kvm' name='qemu64'/> - <machine type='kvm' name='pc-i440fx-2.5' alias='pc' maxCpus='255' default='yes'/> - <machine type='kvm' name='pc-i440fx-2.4' maxCpus='255'/> - <machine type='kvm' name='pc-1.3' maxCpus='255'/> - <machine type='kvm' name='pc-0.12' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.6' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.5' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.2' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.7' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.1' maxCpus='255'/> - <machine type='kvm' name='pc-0.11' maxCpus='255'/> - <machine type='kvm' name='pc-0.10' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.2' maxCpus='255'/> - <machine type='kvm' name='isapc' maxCpus='1'/> - <machine type='kvm' name='pc-i440fx-2.3' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.4' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.5' alias='q35' maxCpus='255'/> - <machine type='kvm' name='pc-0.15' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.0' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' maxCpus='255'/> - <machine type='kvm' name='pc-1.1' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.1' maxCpus='255'/> - <machine type='kvm' name='pc-q35-1.7' maxCpus='255'/> - <machine type='kvm' name='pc-1.0' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.0' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.4' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.3' maxCpus='255'/> - <machine type='kvm' name='pc-0.13' maxCpus='255'/> + <machine type='kvm' name='pc-i440fx-2.5' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.5' alias='q35' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-1.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/> <cpu type='tcg' name='Opteron_G5'/> <cpu type='tcg' name='Opteron_G4'/> <cpu type='tcg' name='Opteron_G3'/> @@ -234,35 +234,35 @@ <cpu type='tcg' name='core2duo'/> <cpu type='tcg' name='phenom'/> <cpu type='tcg' name='qemu64'/> - <machine type='tcg' name='pc-i440fx-2.5' alias='pc' maxCpus='255' default='yes'/> - <machine type='tcg' name='pc-i440fx-2.4' maxCpus='255'/> - <machine type='tcg' name='pc-1.3' maxCpus='255'/> - <machine type='tcg' name='pc-0.12' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.6' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.5' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.2' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.7' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.1' maxCpus='255'/> - <machine type='tcg' name='pc-0.11' maxCpus='255'/> - <machine type='tcg' name='pc-0.10' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.2' maxCpus='255'/> - <machine type='tcg' name='isapc' maxCpus='1'/> - <machine type='tcg' name='pc-i440fx-2.3' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.4' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.5' alias='q35' maxCpus='255'/> - <machine type='tcg' name='pc-0.15' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.0' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' maxCpus='255'/> - <machine type='tcg' name='pc-1.1' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.1' maxCpus='255'/> - <machine type='tcg' name='pc-q35-1.7' maxCpus='255'/> - <machine type='tcg' name='pc-1.0' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.0' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.4' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.3' maxCpus='255'/> - <machine type='tcg' name='pc-0.13' maxCpus='255'/> + <machine type='tcg' name='pc-i440fx-2.5' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.5' alias='q35' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-1.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index f8f57a7eaa..0ce5deb6e9 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -161,47 +161,47 @@ <cpu type='kvm' name='cortex-r5'/> <cpu type='kvm' name='pxa270-a1'/> <cpu type='kvm' name='pxa270'/> - <machine type='kvm' name='integratorcp' maxCpus='1'/> - <machine type='kvm' name='nuri' maxCpus='2'/> - <machine type='kvm' name='verdex' maxCpus='1'/> - <machine type='kvm' name='smdkc210' maxCpus='2'/> - <machine type='kvm' name='collie' maxCpus='1'/> - <machine type='kvm' name='imx25-pdk' maxCpus='1'/> - <machine type='kvm' name='spitz' maxCpus='1'/> - <machine type='kvm' name='realview-pbx-a9' maxCpus='4'/> - <machine type='kvm' name='realview-eb' maxCpus='1'/> - <machine type='kvm' name='versatilepb' maxCpus='1'/> - <machine type='kvm' name='realview-pb-a8' maxCpus='1'/> - <machine type='kvm' name='musicpal' maxCpus='1'/> - <machine type='kvm' name='z2' maxCpus='1'/> - <machine type='kvm' name='akita' maxCpus='1'/> - <machine type='kvm' name='kzm' maxCpus='1'/> - <machine type='kvm' name='realview-eb-mpcore' maxCpus='4'/> - <machine type='kvm' name='sx1' maxCpus='1'/> - <machine type='kvm' name='sx1-v1' maxCpus='1'/> - <machine type='kvm' name='virt-2.6' alias='virt' maxCpus='255'/> - <machine type='kvm' name='cubieboard' maxCpus='1'/> - <machine type='kvm' name='highbank' maxCpus='4'/> - <machine type='kvm' name='raspi2' maxCpus='4'/> - <machine type='kvm' name='netduino2' maxCpus='1'/> - <machine type='kvm' name='terrier' maxCpus='1'/> - <machine type='kvm' name='n810' maxCpus='1'/> - <machine type='kvm' name='mainstone' maxCpus='1'/> - <machine type='kvm' name='palmetto-bmc' maxCpus='1'/> - <machine type='kvm' name='midway' maxCpus='4'/> - <machine type='kvm' name='cheetah' maxCpus='1'/> - <machine type='kvm' name='tosa' maxCpus='1'/> - <machine type='kvm' name='borzoi' maxCpus='1'/> - <machine type='kvm' name='versatileab' maxCpus='1'/> - <machine type='kvm' name='lm3s6965evb' maxCpus='1'/> - <machine type='kvm' name='n800' maxCpus='1'/> - <machine type='kvm' name='connex' maxCpus='1'/> - <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1'/> - <machine type='kvm' name='xlnx-ep108' maxCpus='1'/> - <machine type='kvm' name='vexpress-a9' maxCpus='4'/> - <machine type='kvm' name='vexpress-a15' maxCpus='4'/> - <machine type='kvm' name='canon-a1100' maxCpus='1'/> - <machine type='kvm' name='lm3s811evb' maxCpus='1'/> + <machine type='kvm' name='integratorcp' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='nuri' maxCpus='2' numaMemSupported='yes'/> + <machine type='kvm' name='verdex' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='smdkc210' maxCpus='2' numaMemSupported='yes'/> + <machine type='kvm' name='collie' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='imx25-pdk' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='spitz' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='realview-pbx-a9' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='realview-eb' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='versatilepb' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='realview-pb-a8' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='musicpal' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='z2' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='akita' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='kzm' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='realview-eb-mpcore' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='sx1' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='sx1-v1' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.6' alias='virt' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='cubieboard' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='highbank' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='raspi2' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='netduino2' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='terrier' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='n810' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='mainstone' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='palmetto-bmc' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='midway' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='cheetah' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='tosa' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='borzoi' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='versatileab' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='lm3s6965evb' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='n800' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='connex' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='xlnx-ep108' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='vexpress-a9' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='vexpress-a15' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='canon-a1100' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='lm3s811evb' maxCpus='1' numaMemSupported='yes'/> <cpu type='tcg' name='pxa262'/> <cpu type='tcg' name='pxa270-a0'/> <cpu type='tcg' name='arm1136'/> @@ -232,47 +232,47 @@ <cpu type='tcg' name='cortex-r5'/> <cpu type='tcg' name='pxa270-a1'/> <cpu type='tcg' name='pxa270'/> - <machine type='tcg' name='integratorcp' maxCpus='1'/> - <machine type='tcg' name='nuri' maxCpus='2'/> - <machine type='tcg' name='verdex' maxCpus='1'/> - <machine type='tcg' name='smdkc210' maxCpus='2'/> - <machine type='tcg' name='collie' maxCpus='1'/> - <machine type='tcg' name='imx25-pdk' maxCpus='1'/> - <machine type='tcg' name='spitz' maxCpus='1'/> - <machine type='tcg' name='realview-pbx-a9' maxCpus='4'/> - <machine type='tcg' name='realview-eb' maxCpus='1'/> - <machine type='tcg' name='versatilepb' maxCpus='1'/> - <machine type='tcg' name='realview-pb-a8' maxCpus='1'/> - <machine type='tcg' name='musicpal' maxCpus='1'/> - <machine type='tcg' name='z2' maxCpus='1'/> - <machine type='tcg' name='akita' maxCpus='1'/> - <machine type='tcg' name='kzm' maxCpus='1'/> - <machine type='tcg' name='realview-eb-mpcore' maxCpus='4'/> - <machine type='tcg' name='sx1' maxCpus='1'/> - <machine type='tcg' name='sx1-v1' maxCpus='1'/> - <machine type='tcg' name='virt-2.6' alias='virt' maxCpus='255'/> - <machine type='tcg' name='cubieboard' maxCpus='1'/> - <machine type='tcg' name='highbank' maxCpus='4'/> - <machine type='tcg' name='raspi2' maxCpus='4'/> - <machine type='tcg' name='netduino2' maxCpus='1'/> - <machine type='tcg' name='terrier' maxCpus='1'/> - <machine type='tcg' name='n810' maxCpus='1'/> - <machine type='tcg' name='mainstone' maxCpus='1'/> - <machine type='tcg' name='palmetto-bmc' maxCpus='1'/> - <machine type='tcg' name='midway' maxCpus='4'/> - <machine type='tcg' name='cheetah' maxCpus='1'/> - <machine type='tcg' name='tosa' maxCpus='1'/> - <machine type='tcg' name='borzoi' maxCpus='1'/> - <machine type='tcg' name='versatileab' maxCpus='1'/> - <machine type='tcg' name='lm3s6965evb' maxCpus='1'/> - <machine type='tcg' name='n800' maxCpus='1'/> - <machine type='tcg' name='connex' maxCpus='1'/> - <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1'/> - <machine type='tcg' name='xlnx-ep108' maxCpus='1'/> - <machine type='tcg' name='vexpress-a9' maxCpus='4'/> - <machine type='tcg' name='vexpress-a15' maxCpus='4'/> - <machine type='tcg' name='canon-a1100' maxCpus='1'/> - <machine type='tcg' name='lm3s811evb' maxCpus='1'/> + <machine type='tcg' name='integratorcp' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='nuri' maxCpus='2' numaMemSupported='yes'/> + <machine type='tcg' name='verdex' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='smdkc210' maxCpus='2' numaMemSupported='yes'/> + <machine type='tcg' name='collie' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='imx25-pdk' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='spitz' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='realview-pbx-a9' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='realview-eb' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='versatilepb' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='realview-pb-a8' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='musicpal' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='z2' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='akita' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='kzm' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='realview-eb-mpcore' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='sx1' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='sx1-v1' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.6' alias='virt' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='cubieboard' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='highbank' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='raspi2' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='netduino2' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='terrier' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='n810' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='mainstone' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='palmetto-bmc' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='midway' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='cheetah' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='tosa' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='borzoi' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='versatileab' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='lm3s6965evb' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='n800' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='connex' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='xlnx-ep108' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='vexpress-a9' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='vexpress-a15' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='canon-a1100' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='lm3s811evb' maxCpus='1' numaMemSupported='yes'/> <gic version='3' kernel='no' emulated='no'/> <gic version='2' kernel='yes' emulated='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 52592ad138..13573cfd03 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -558,21 +558,21 @@ <cpu type='kvm' name='MPC8544E_v11'/> <cpu type='kvm' name='405GPb'/> <cpu type='kvm' name='MPC8541E_v11'/> - <machine type='kvm' name='pseries-2.6' alias='pseries' maxCpus='255' default='yes'/> - <machine type='kvm' name='ref405ep' maxCpus='1'/> - <machine type='kvm' name='virtex-ml507' maxCpus='1'/> - <machine type='kvm' name='ppce500' maxCpus='32'/> - <machine type='kvm' name='mpc8544ds' maxCpus='15'/> - <machine type='kvm' name='bamboo' maxCpus='1'/> - <machine type='kvm' name='g3beige' maxCpus='1'/> - <machine type='kvm' name='prep' maxCpus='1'/> - <machine type='kvm' name='mac99' maxCpus='1'/> - <machine type='kvm' name='pseries-2.4' maxCpus='255'/> - <machine type='kvm' name='pseries-2.5' maxCpus='255'/> - <machine type='kvm' name='pseries-2.2' maxCpus='255'/> - <machine type='kvm' name='taihu' maxCpus='1'/> - <machine type='kvm' name='pseries-2.3' maxCpus='255'/> - <machine type='kvm' name='pseries-2.1' maxCpus='255'/> + <machine type='kvm' name='pseries-2.6' alias='pseries' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='ref405ep' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='ppce500' maxCpus='32' numaMemSupported='yes'/> + <machine type='kvm' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/> + <machine type='kvm' name='bamboo' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='g3beige' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='prep' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='mac99' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='taihu' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.1' maxCpus='255' numaMemSupported='yes'/> <cpu type='tcg' name='default'/> <cpu type='tcg' name='ppc'/> <cpu type='tcg' name='ppc32'/> @@ -1003,19 +1003,19 @@ <cpu type='tcg' name='MPC8544E_v11'/> <cpu type='tcg' name='405GPb'/> <cpu type='tcg' name='MPC8541E_v11'/> - <machine type='tcg' name='pseries-2.6' alias='pseries' maxCpus='255' default='yes'/> - <machine type='tcg' name='ref405ep' maxCpus='1'/> - <machine type='tcg' name='virtex-ml507' maxCpus='1'/> - <machine type='tcg' name='ppce500' maxCpus='32'/> - <machine type='tcg' name='mpc8544ds' maxCpus='15'/> - <machine type='tcg' name='bamboo' maxCpus='1'/> - <machine type='tcg' name='g3beige' maxCpus='1'/> - <machine type='tcg' name='prep' maxCpus='1'/> - <machine type='tcg' name='mac99' maxCpus='1'/> - <machine type='tcg' name='pseries-2.4' maxCpus='255'/> - <machine type='tcg' name='pseries-2.5' maxCpus='255'/> - <machine type='tcg' name='pseries-2.2' maxCpus='255'/> - <machine type='tcg' name='taihu' maxCpus='1'/> - <machine type='tcg' name='pseries-2.3' maxCpus='255'/> - <machine type='tcg' name='pseries-2.1' maxCpus='255'/> + <machine type='tcg' name='pseries-2.6' alias='pseries' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='ref405ep' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='ppce500' maxCpus='32' numaMemSupported='yes'/> + <machine type='tcg' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/> + <machine type='tcg' name='bamboo' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='g3beige' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='prep' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='mac99' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='taihu' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.1' maxCpus='255' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 77297fff36..0c9f594a65 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -187,31 +187,31 @@ <cpu type='kvm' name='core2duo'/> <cpu type='kvm' name='phenom'/> <cpu type='kvm' name='qemu64'/> - <machine type='kvm' name='pc-i440fx-2.6' alias='pc' maxCpus='255' default='yes'/> - <machine type='kvm' name='pc-0.12' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.4' maxCpus='255'/> - <machine type='kvm' name='pc-1.3' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.6' alias='q35' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.7' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255'/> - <machine type='kvm' name='pc-0.11' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.3' maxCpus='255'/> - <machine type='kvm' name='pc-0.10' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.2' maxCpus='255'/> - <machine type='kvm' name='isapc' maxCpus='1'/> - <machine type='kvm' name='pc-q35-2.5' maxCpus='255'/> - <machine type='kvm' name='pc-0.15' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.5' maxCpus='255'/> - <machine type='kvm' name='pc-1.1' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.1' maxCpus='255'/> - <machine type='kvm' name='pc-1.0' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.0' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.4' maxCpus='255'/> - <machine type='kvm' name='pc-0.13' maxCpus='255'/> + <machine type='kvm' name='pc-i440fx-2.6' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.6' alias='q35' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/> <cpu type='tcg' name='Opteron_G5'/> <cpu type='tcg' name='Opteron_G4'/> <cpu type='tcg' name='Opteron_G3'/> @@ -240,29 +240,29 @@ <cpu type='tcg' name='core2duo'/> <cpu type='tcg' name='phenom'/> <cpu type='tcg' name='qemu64'/> - <machine type='tcg' name='pc-i440fx-2.6' alias='pc' maxCpus='255' default='yes'/> - <machine type='tcg' name='pc-0.12' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.4' maxCpus='255'/> - <machine type='tcg' name='pc-1.3' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.6' alias='q35' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.7' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255'/> - <machine type='tcg' name='pc-0.11' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.3' maxCpus='255'/> - <machine type='tcg' name='pc-0.10' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.2' maxCpus='255'/> - <machine type='tcg' name='isapc' maxCpus='1'/> - <machine type='tcg' name='pc-q35-2.5' maxCpus='255'/> - <machine type='tcg' name='pc-0.15' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.5' maxCpus='255'/> - <machine type='tcg' name='pc-1.1' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.1' maxCpus='255'/> - <machine type='tcg' name='pc-1.0' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.0' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.4' maxCpus='255'/> - <machine type='tcg' name='pc-0.13' maxCpus='255'/> + <machine type='tcg' name='pc-i440fx-2.6' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.6' alias='q35' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.3' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.2' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.5' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.1' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.4' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index f1ba44d78f..571d748f6c 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -98,13 +98,13 @@ <package></package> <arch>s390x</arch> <cpu type='kvm' name='host'/> - <machine type='kvm' name='s390-ccw-virtio-2.7' alias='s390-ccw-virtio' maxCpus='248' default='yes'/> - <machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248'/> + <machine type='kvm' name='s390-ccw-virtio-2.7' alias='s390-ccw-virtio' maxCpus='248' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248' numaMemSupported='yes'/> <cpu type='tcg' name='host'/> - <machine type='tcg' name='s390-ccw-virtio-2.7' alias='s390-ccw-virtio' maxCpus='248' default='yes'/> - <machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248'/> + <machine type='tcg' name='s390-ccw-virtio-2.7' alias='s390-ccw-virtio' maxCpus='248' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index e7d9808e28..c97fa18a1f 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -193,33 +193,33 @@ <cpu type='kvm' name='core2duo'/> <cpu type='kvm' name='phenom'/> <cpu type='kvm' name='qemu64'/> - <machine type='kvm' name='pc-i440fx-2.7' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.7' alias='q35' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> + <machine type='kvm' name='pc-i440fx-2.7' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.7' alias='q35' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> <cpu type='tcg' name='Opteron_G5'/> <cpu type='tcg' name='Opteron_G4'/> <cpu type='tcg' name='Opteron_G3'/> @@ -249,31 +249,31 @@ <cpu type='tcg' name='core2duo'/> <cpu type='tcg' name='phenom'/> <cpu type='tcg' name='qemu64'/> - <machine type='tcg' name='pc-i440fx-2.7' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.7' alias='q35' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> + <machine type='tcg' name='pc-i440fx-2.7' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.7' alias='q35' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 5d8545146a..be5cf4977b 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -183,11 +183,11 @@ <cpu type='kvm' name='z196-base'/> <cpu type='kvm' name='z13-base'/> <cpu type='kvm' name='z890'/> - <machine type='kvm' name='s390-ccw-virtio-2.8' alias='s390-ccw-virtio' maxCpus='248' default='yes'/> - <machine type='kvm' name='s390-ccw-virtio-2.7' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248'/> + <machine type='kvm' name='s390-ccw-virtio-2.8' alias='s390-ccw-virtio' maxCpus='248' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.7' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248' numaMemSupported='yes'/> <cpu type='tcg' name='z10EC-base'/> <cpu type='tcg' name='z9EC-base'/> <cpu type='tcg' name='z196.2-base'/> @@ -252,9 +252,9 @@ <cpu type='tcg' name='z196-base'/> <cpu type='tcg' name='z13-base'/> <cpu type='tcg' name='z890'/> - <machine type='tcg' name='s390-ccw-virtio-2.8' alias='s390-ccw-virtio' maxCpus='248' default='yes'/> - <machine type='tcg' name='s390-ccw-virtio-2.7' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248'/> + <machine type='tcg' name='s390-ccw-virtio-2.8' alias='s390-ccw-virtio' maxCpus='248' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.7' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index bfeb9c9b40..9a2b1f83ac 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -222,37 +222,37 @@ <cpu type='kvm' name='Broadwell' usable='yes'/> <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/> <cpu type='kvm' name='486' usable='yes'/> - <machine type='kvm' name='pc-i440fx-2.8' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='xenpv' maxCpus='1'/> - <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='xenfv' hotplugCpus='yes' maxCpus='128'/> - <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.8' alias='q35' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> + <machine type='kvm' name='pc-i440fx-2.8' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='xenpv' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='xenfv' hotplugCpus='yes' maxCpus='128' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.8' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> <cpu type='tcg' name='host' usable='no'> <blocker name='kvm'/> </cpu> @@ -378,35 +378,35 @@ <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='486' usable='yes'/> - <machine type='tcg' name='pc-i440fx-2.8' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='xenpv' maxCpus='1'/> - <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='xenfv' hotplugCpus='yes' maxCpus='128'/> - <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.8' alias='q35' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> + <machine type='tcg' name='pc-i440fx-2.8' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='xenpv' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='xenfv' hotplugCpus='yes' maxCpus='128' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.8' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index f32e233549..0c32a1c305 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -573,26 +573,26 @@ <cpu type='kvm' name='MPC8544E_v11'/> <cpu type='kvm' name='405GPb'/> <cpu type='kvm' name='MPC8541E_v11'/> - <machine type='kvm' name='pseries-2.9' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/> - <machine type='kvm' name='ref405ep' maxCpus='1'/> - <machine type='kvm' name='virtex-ml507' maxCpus='1'/> - <machine type='kvm' name='powernv' maxCpus='2048'/> - <machine type='kvm' name='ppce500' maxCpus='32'/> - <machine type='kvm' name='mpc8544ds' maxCpus='15'/> - <machine type='kvm' name='bamboo' maxCpus='1'/> - <machine type='kvm' name='g3beige' maxCpus='1'/> - <machine type='kvm' name='prep' maxCpus='1'/> - <machine type='kvm' name='mac99' maxCpus='1'/> - <machine type='kvm' name='pseries-2.6' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.4' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.5' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.2' maxCpus='1024'/> - <machine type='kvm' name='taihu' maxCpus='1'/> - <machine type='kvm' name='pseries-2.3' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.1' maxCpus='1024'/> - <machine type='kvm' name='40p' maxCpus='1'/> + <machine type='kvm' name='pseries-2.9' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='ref405ep' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='powernv' maxCpus='2048' numaMemSupported='yes'/> + <machine type='kvm' name='ppce500' maxCpus='32' numaMemSupported='yes'/> + <machine type='kvm' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/> + <machine type='kvm' name='bamboo' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='g3beige' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='prep' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='mac99' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='taihu' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='40p' maxCpus='1' numaMemSupported='yes'/> <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/> <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/> <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/> @@ -1026,24 +1026,24 @@ <cpu type='tcg' name='MPC8544E_v11'/> <cpu type='tcg' name='405GPb'/> <cpu type='tcg' name='MPC8541E_v11'/> - <machine type='tcg' name='pseries-2.9' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/> - <machine type='tcg' name='ref405ep' maxCpus='1'/> - <machine type='tcg' name='virtex-ml507' maxCpus='1'/> - <machine type='tcg' name='powernv' maxCpus='2048'/> - <machine type='tcg' name='ppce500' maxCpus='32'/> - <machine type='tcg' name='mpc8544ds' maxCpus='15'/> - <machine type='tcg' name='bamboo' maxCpus='1'/> - <machine type='tcg' name='g3beige' maxCpus='1'/> - <machine type='tcg' name='prep' maxCpus='1'/> - <machine type='tcg' name='mac99' maxCpus='1'/> - <machine type='tcg' name='pseries-2.6' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.4' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.5' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.2' maxCpus='1024'/> - <machine type='tcg' name='taihu' maxCpus='1'/> - <machine type='tcg' name='pseries-2.3' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.1' maxCpus='1024'/> - <machine type='tcg' name='40p' maxCpus='1'/> + <machine type='tcg' name='pseries-2.9' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='ref405ep' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='powernv' maxCpus='2048' numaMemSupported='yes'/> + <machine type='tcg' name='ppce500' maxCpus='32' numaMemSupported='yes'/> + <machine type='tcg' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/> + <machine type='tcg' name='bamboo' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='g3beige' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='prep' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='mac99' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='taihu' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='40p' maxCpus='1' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 4e7919316d..c93cd4211f 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -189,12 +189,12 @@ <cpu type='kvm' name='z196-base' typename='z196-base-s390-cpu'/> <cpu type='kvm' name='z13-base' typename='z13-base-s390-cpu'/> <cpu type='kvm' name='z890' typename='z890-s390-cpu'/> - <machine type='kvm' name='s390-ccw-virtio-2.9' alias='s390-ccw-virtio' maxCpus='248' default='yes'/> - <machine type='kvm' name='s390-ccw-virtio-2.7' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.8' maxCpus='248'/> + <machine type='kvm' name='s390-ccw-virtio-2.9' alias='s390-ccw-virtio' maxCpus='248' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.7' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.8' maxCpus='248' numaMemSupported='yes'/> <cpu type='tcg' name='z10EC-base' typename='z10EC-base-s390-cpu'/> <cpu type='tcg' name='z9EC-base' typename='z9EC-base-s390-cpu'/> <cpu type='tcg' name='z196.2-base' typename='z196.2-base-s390-cpu'/> @@ -259,10 +259,10 @@ <cpu type='tcg' name='z196-base' typename='z196-base-s390-cpu'/> <cpu type='tcg' name='z13-base' typename='z13-base-s390-cpu'/> <cpu type='tcg' name='z890' typename='z890-s390-cpu'/> - <machine type='tcg' name='s390-ccw-virtio-2.9' alias='s390-ccw-virtio' maxCpus='248' default='yes'/> - <machine type='tcg' name='s390-ccw-virtio-2.7' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.8' maxCpus='248'/> + <machine type='tcg' name='s390-ccw-virtio-2.9' alias='s390-ccw-virtio' maxCpus='248' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.7' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.8' maxCpus='248' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 75e9905df7..122d9509f1 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -473,39 +473,39 @@ <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='kvm' name='pc-i440fx-2.9' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='xenpv' maxCpus='1'/> - <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='xenfv' hotplugCpus='yes' maxCpus='128'/> - <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.9' alias='q35' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> + <machine type='kvm' name='pc-i440fx-2.9' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='xenpv' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='xenfv' hotplugCpus='yes' maxCpus='128' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.9' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> <hostCPU type='tcg' model='base' migratability='yes'> <property name='phys-bits' type='number' value='0'/> <property name='core-id' type='number' value='-1'/> @@ -865,37 +865,37 @@ <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='tcg' name='pc-i440fx-2.9' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='xenpv' maxCpus='1'/> - <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='xenfv' hotplugCpus='yes' maxCpus='128'/> - <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.9' alias='q35' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> + <machine type='tcg' name='pc-i440fx-2.9' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='xenpv' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='xenfv' hotplugCpus='yes' maxCpus='128' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.9' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index a66008b0de..b81ed605d3 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -604,32 +604,32 @@ <cpu type='kvm' name='750_v3.1'/> <cpu type='kvm' name='power5+_v2.1'/> <cpu type='kvm' name='mpc8568e'/> - <machine type='kvm' name='pseries-3.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/> - <machine type='kvm' name='ref405ep' maxCpus='1'/> - <machine type='kvm' name='sam460ex' maxCpus='1'/> - <machine type='kvm' name='virtex-ml507' maxCpus='1'/> - <machine type='kvm' name='powernv' maxCpus='2048'/> - <machine type='kvm' name='ppce500' maxCpus='32'/> - <machine type='kvm' name='mpc8544ds' maxCpus='15'/> - <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='bamboo' maxCpus='1'/> - <machine type='kvm' name='g3beige' maxCpus='1'/> - <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='prep' maxCpus='1'/> - <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='mac99' maxCpus='1'/> - <machine type='kvm' name='pseries-2.6' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.4' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.5' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.2' maxCpus='1024'/> - <machine type='kvm' name='taihu' maxCpus='1'/> - <machine type='kvm' name='pseries-2.3' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.1' maxCpus='1024'/> - <machine type='kvm' name='40p' maxCpus='1'/> + <machine type='kvm' name='pseries-3.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='ref405ep' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='sam460ex' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='powernv' maxCpus='2048' numaMemSupported='yes'/> + <machine type='kvm' name='ppce500' maxCpus='32' numaMemSupported='yes'/> + <machine type='kvm' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='bamboo' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='g3beige' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='prep' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='mac99' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='taihu' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='40p' maxCpus='1' numaMemSupported='yes'/> <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/> <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/> <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/> @@ -1067,30 +1067,30 @@ <cpu type='tcg' name='750_v3.1'/> <cpu type='tcg' name='power5+_v2.1'/> <cpu type='tcg' name='mpc8568e'/> - <machine type='tcg' name='pseries-3.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/> - <machine type='tcg' name='ref405ep' maxCpus='1'/> - <machine type='tcg' name='sam460ex' maxCpus='1'/> - <machine type='tcg' name='virtex-ml507' maxCpus='1'/> - <machine type='tcg' name='powernv' maxCpus='2048'/> - <machine type='tcg' name='ppce500' maxCpus='32'/> - <machine type='tcg' name='mpc8544ds' maxCpus='15'/> - <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='bamboo' maxCpus='1'/> - <machine type='tcg' name='g3beige' maxCpus='1'/> - <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='prep' maxCpus='1'/> - <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='mac99' maxCpus='1'/> - <machine type='tcg' name='pseries-2.6' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.4' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.5' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.2' maxCpus='1024'/> - <machine type='tcg' name='taihu' maxCpus='1'/> - <machine type='tcg' name='pseries-2.3' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.1' maxCpus='1024'/> - <machine type='tcg' name='40p' maxCpus='1'/> + <machine type='tcg' name='pseries-3.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='ref405ep' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='sam460ex' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='powernv' maxCpus='2048' numaMemSupported='yes'/> + <machine type='tcg' name='ppce500' maxCpus='32' numaMemSupported='yes'/> + <machine type='tcg' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='bamboo' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='g3beige' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='prep' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='mac99' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='taihu' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='40p' maxCpus='1' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 690c964f76..e2c87dafe3 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -102,9 +102,9 @@ <microcodeVersion>0</microcodeVersion> <package></package> <arch>riscv32</arch> - <machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes'/> - <machine type='tcg' name='spike_v1.9.1' maxCpus='1'/> - <machine type='tcg' name='sifive_e' maxCpus='1'/> - <machine type='tcg' name='virt' maxCpus='8'/> - <machine type='tcg' name='sifive_u' maxCpus='1'/> + <machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='spike_v1.9.1' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='sifive_e' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt' maxCpus='8' numaMemSupported='yes'/> + <machine type='tcg' name='sifive_u' maxCpus='1' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index ad2a5fe163..0b8e5589db 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -102,9 +102,9 @@ <microcodeVersion>0</microcodeVersion> <package></package> <arch>riscv64</arch> - <machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes'/> - <machine type='tcg' name='spike_v1.9.1' maxCpus='1'/> - <machine type='tcg' name='sifive_e' maxCpus='1'/> - <machine type='tcg' name='virt' maxCpus='8'/> - <machine type='tcg' name='sifive_u' maxCpus='1'/> + <machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='spike_v1.9.1' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='sifive_e' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt' maxCpus='8' numaMemSupported='yes'/> + <machine type='tcg' name='sifive_u' maxCpus='1' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index cdd89c8c7d..189bc09288 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -238,16 +238,16 @@ <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/> - <machine type='kvm' name='s390-ccw-virtio-3.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/> - <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/> + <machine type='kvm' name='s390-ccw-virtio-3.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> <cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'> <blocker name='klmd-sha-1'/> <blocker name='kimd-sha-1'/> @@ -2687,14 +2687,14 @@ <blocker name='kmac-dea'/> <blocker name='hfpm'/> </cpu> - <machine type='tcg' name='s390-ccw-virtio-3.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/> - <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/> + <machine type='tcg' name='s390-ccw-virtio-3.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index f5f1d5b466..40cff641a8 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -584,45 +584,45 @@ <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='kvm' name='pc-i440fx-3.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-q35-3.0' alias='q35' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> + <machine type='kvm' name='pc-i440fx-3.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-3.0' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> <hostCPU type='tcg' model='base' migratability='yes'> <property name='phys-bits' type='number' value='0'/> <property name='core-id' type='number' value='-1'/> @@ -1188,43 +1188,43 @@ <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='tcg' name='pc-i440fx-3.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-q35-3.0' alias='q35' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> + <machine type='tcg' name='pc-i440fx-3.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-3.0' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index ca9ff82e28..4e47e0a581 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -609,33 +609,33 @@ <cpu type='kvm' name='750_v3.1'/> <cpu type='kvm' name='power5+_v2.1'/> <cpu type='kvm' name='mpc8568e'/> - <machine type='kvm' name='pseries-3.1' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/> - <machine type='kvm' name='ref405ep' maxCpus='1'/> - <machine type='kvm' name='sam460ex' maxCpus='1'/> - <machine type='kvm' name='virtex-ml507' maxCpus='1'/> - <machine type='kvm' name='powernv' maxCpus='2048'/> - <machine type='kvm' name='ppce500' maxCpus='32'/> - <machine type='kvm' name='mpc8544ds' maxCpus='15'/> - <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='bamboo' maxCpus='1'/> - <machine type='kvm' name='g3beige' maxCpus='1'/> - <machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='prep' maxCpus='1'/> - <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='mac99' maxCpus='1'/> - <machine type='kvm' name='pseries-2.6' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.4' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.5' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.2' maxCpus='1024'/> - <machine type='kvm' name='taihu' maxCpus='1'/> - <machine type='kvm' name='pseries-2.3' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.1' maxCpus='1024'/> - <machine type='kvm' name='40p' maxCpus='1'/> + <machine type='kvm' name='pseries-3.1' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='ref405ep' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='sam460ex' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='powernv' maxCpus='2048' numaMemSupported='yes'/> + <machine type='kvm' name='ppce500' maxCpus='32' numaMemSupported='yes'/> + <machine type='kvm' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='bamboo' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='g3beige' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='prep' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='mac99' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='taihu' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='40p' maxCpus='1' numaMemSupported='yes'/> <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/> <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/> <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/> @@ -1073,31 +1073,31 @@ <cpu type='tcg' name='750_v3.1'/> <cpu type='tcg' name='power5+_v2.1'/> <cpu type='tcg' name='mpc8568e'/> - <machine type='tcg' name='pseries-3.1' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/> - <machine type='tcg' name='ref405ep' maxCpus='1'/> - <machine type='tcg' name='sam460ex' maxCpus='1'/> - <machine type='tcg' name='virtex-ml507' maxCpus='1'/> - <machine type='tcg' name='powernv' maxCpus='2048'/> - <machine type='tcg' name='ppce500' maxCpus='32'/> - <machine type='tcg' name='mpc8544ds' maxCpus='15'/> - <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='bamboo' maxCpus='1'/> - <machine type='tcg' name='g3beige' maxCpus='1'/> - <machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='prep' maxCpus='1'/> - <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='mac99' maxCpus='1'/> - <machine type='tcg' name='pseries-2.6' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.4' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.5' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.2' maxCpus='1024'/> - <machine type='tcg' name='taihu' maxCpus='1'/> - <machine type='tcg' name='pseries-2.3' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.1' maxCpus='1024'/> - <machine type='tcg' name='40p' maxCpus='1'/> + <machine type='tcg' name='pseries-3.1' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='ref405ep' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='sam460ex' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='powernv' maxCpus='2048' numaMemSupported='yes'/> + <machine type='tcg' name='ppce500' maxCpus='32' numaMemSupported='yes'/> + <machine type='tcg' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='bamboo' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='g3beige' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='prep' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='mac99' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='taihu' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='40p' maxCpus='1' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 11009a2f80..3dbda4b3f3 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -663,47 +663,47 @@ <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='kvm' name='pc-i440fx-3.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-3.1' alias='q35' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> + <machine type='kvm' name='pc-i440fx-3.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-3.1' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> <hostCPU type='tcg' model='base' migratability='yes'> <property name='phys-bits' type='number' value='0'/> <property name='core-id' type='number' value='-1'/> @@ -1373,45 +1373,45 @@ <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='tcg' name='pc-i440fx-3.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-3.1' alias='q35' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> + <machine type='tcg' name='pc-i440fx-3.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-3.1' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml index c9199df261..2b5210338f 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -214,72 +214,72 @@ <cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/> <cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/> <cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/> - <machine type='kvm' name='integratorcp' maxCpus='1'/> - <machine type='kvm' name='nuri' maxCpus='2'/> - <machine type='kvm' name='mps2-an511' maxCpus='1'/> - <machine type='kvm' name='verdex' maxCpus='1'/> - <machine type='kvm' name='mps2-an505' maxCpus='1'/> - <machine type='kvm' name='virt-3.0' maxCpus='512'/> - <machine type='kvm' name='ast2500-evb' maxCpus='1'/> - <machine type='kvm' name='smdkc210' maxCpus='2'/> - <machine type='kvm' name='collie' maxCpus='1'/> - <machine type='kvm' name='xlnx-versal-virt' maxCpus='2'/> - <machine type='kvm' name='imx25-pdk' maxCpus='1'/> - <machine type='kvm' name='spitz' maxCpus='1'/> - <machine type='kvm' name='musca-b1' maxCpus='2'/> - <machine type='kvm' name='realview-pbx-a9' maxCpus='4'/> - <machine type='kvm' name='realview-eb' maxCpus='1'/> - <machine type='kvm' name='realview-pb-a8' maxCpus='1'/> - <machine type='kvm' name='versatilepb' maxCpus='1'/> - <machine type='kvm' name='emcraft-sf2' maxCpus='1'/> - <machine type='kvm' name='virt-2.9' maxCpus='255'/> - <machine type='kvm' name='musicpal' maxCpus='1'/> - <machine type='kvm' name='z2' maxCpus='1'/> - <machine type='kvm' name='akita' maxCpus='1'/> - <machine type='kvm' name='virt-2.7' maxCpus='255'/> - <machine type='kvm' name='kzm' maxCpus='1'/> - <machine type='kvm' name='virt-2.8' maxCpus='255'/> - <machine type='kvm' name='realview-eb-mpcore' maxCpus='4'/> - <machine type='kvm' name='musca-a' maxCpus='2'/> - <machine type='kvm' name='mcimx7d-sabre' maxCpus='2'/> - <machine type='kvm' name='sx1' maxCpus='1'/> - <machine type='kvm' name='sx1-v1' maxCpus='1'/> - <machine type='kvm' name='virt-2.6' maxCpus='255'/> - <machine type='kvm' name='cubieboard' maxCpus='1'/> - <machine type='kvm' name='virt-4.0' alias='virt' maxCpus='512'/> - <machine type='kvm' name='highbank' maxCpus='4'/> - <machine type='kvm' name='raspi2' maxCpus='4'/> - <machine type='kvm' name='raspi3' maxCpus='4'/> - <machine type='kvm' name='netduino2' maxCpus='1'/> - <machine type='kvm' name='terrier' maxCpus='1'/> - <machine type='kvm' name='n810' maxCpus='1'/> - <machine type='kvm' name='mainstone' maxCpus='1'/> - <machine type='kvm' name='palmetto-bmc' maxCpus='1'/> - <machine type='kvm' name='sabrelite' maxCpus='4'/> - <machine type='kvm' name='midway' maxCpus='4'/> - <machine type='kvm' name='romulus-bmc' maxCpus='1'/> - <machine type='kvm' name='cheetah' maxCpus='1'/> - <machine type='kvm' name='tosa' maxCpus='1'/> - <machine type='kvm' name='borzoi' maxCpus='1'/> - <machine type='kvm' name='versatileab' maxCpus='1'/> - <machine type='kvm' name='lm3s6965evb' maxCpus='1'/> - <machine type='kvm' name='n800' maxCpus='1'/> - <machine type='kvm' name='virt-2.10' maxCpus='255'/> - <machine type='kvm' name='virt-2.11' maxCpus='255'/> - <machine type='kvm' name='connex' maxCpus='1'/> - <machine type='kvm' name='virt-2.12' maxCpus='255'/> - <machine type='kvm' name='microbit' maxCpus='1'/> - <machine type='kvm' name='witherspoon-bmc' maxCpus='1'/> - <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1'/> - <machine type='kvm' name='mps2-an385' maxCpus='1'/> - <machine type='kvm' name='vexpress-a9' maxCpus='4'/> - <machine type='kvm' name='mps2-an521' maxCpus='2'/> - <machine type='kvm' name='mcimx6ul-evk' maxCpus='1'/> - <machine type='kvm' name='vexpress-a15' maxCpus='4'/> - <machine type='kvm' name='xlnx-zcu102' maxCpus='6'/> - <machine type='kvm' name='virt-3.1' maxCpus='512'/> - <machine type='kvm' name='canon-a1100' maxCpus='1'/> - <machine type='kvm' name='lm3s811evb' maxCpus='1'/> + <machine type='kvm' name='integratorcp' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='nuri' maxCpus='2' numaMemSupported='yes'/> + <machine type='kvm' name='mps2-an511' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='verdex' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='mps2-an505' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-3.0' maxCpus='512' numaMemSupported='yes'/> + <machine type='kvm' name='ast2500-evb' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='smdkc210' maxCpus='2' numaMemSupported='yes'/> + <machine type='kvm' name='collie' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='xlnx-versal-virt' maxCpus='2' numaMemSupported='yes'/> + <machine type='kvm' name='imx25-pdk' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='spitz' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='musca-b1' maxCpus='2' numaMemSupported='yes'/> + <machine type='kvm' name='realview-pbx-a9' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='realview-eb' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='realview-pb-a8' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='versatilepb' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='emcraft-sf2' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.9' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='musicpal' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='z2' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='akita' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='kzm' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.8' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='realview-eb-mpcore' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='musca-a' maxCpus='2' numaMemSupported='yes'/> + <machine type='kvm' name='mcimx7d-sabre' maxCpus='2' numaMemSupported='yes'/> + <machine type='kvm' name='sx1' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='sx1-v1' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='cubieboard' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-4.0' alias='virt' maxCpus='512' numaMemSupported='yes'/> + <machine type='kvm' name='highbank' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='raspi2' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='raspi3' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='netduino2' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='terrier' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='n810' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='mainstone' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='palmetto-bmc' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='sabrelite' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='midway' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='romulus-bmc' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='cheetah' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='tosa' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='borzoi' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='versatileab' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='lm3s6965evb' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='n800' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='connex' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.12' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='microbit' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='witherspoon-bmc' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='mps2-an385' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='vexpress-a9' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='mps2-an521' maxCpus='2' numaMemSupported='yes'/> + <machine type='kvm' name='mcimx6ul-evk' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='vexpress-a15' maxCpus='4' numaMemSupported='yes'/> + <machine type='kvm' name='xlnx-zcu102' maxCpus='6' numaMemSupported='yes'/> + <machine type='kvm' name='virt-3.1' maxCpus='512' numaMemSupported='yes'/> + <machine type='kvm' name='canon-a1100' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='lm3s811evb' maxCpus='1' numaMemSupported='yes'/> <cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/> <cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/> <cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/> @@ -317,72 +317,72 @@ <cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/> <cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/> <cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/> - <machine type='tcg' name='integratorcp' maxCpus='1'/> - <machine type='tcg' name='nuri' maxCpus='2'/> - <machine type='tcg' name='mps2-an511' maxCpus='1'/> - <machine type='tcg' name='verdex' maxCpus='1'/> - <machine type='tcg' name='mps2-an505' maxCpus='1'/> - <machine type='tcg' name='virt-3.0' maxCpus='512'/> - <machine type='tcg' name='ast2500-evb' maxCpus='1'/> - <machine type='tcg' name='smdkc210' maxCpus='2'/> - <machine type='tcg' name='collie' maxCpus='1'/> - <machine type='tcg' name='xlnx-versal-virt' maxCpus='2'/> - <machine type='tcg' name='imx25-pdk' maxCpus='1'/> - <machine type='tcg' name='spitz' maxCpus='1'/> - <machine type='tcg' name='musca-b1' maxCpus='2'/> - <machine type='tcg' name='realview-pbx-a9' maxCpus='4'/> - <machine type='tcg' name='realview-eb' maxCpus='1'/> - <machine type='tcg' name='realview-pb-a8' maxCpus='1'/> - <machine type='tcg' name='versatilepb' maxCpus='1'/> - <machine type='tcg' name='emcraft-sf2' maxCpus='1'/> - <machine type='tcg' name='virt-2.9' maxCpus='255'/> - <machine type='tcg' name='musicpal' maxCpus='1'/> - <machine type='tcg' name='z2' maxCpus='1'/> - <machine type='tcg' name='akita' maxCpus='1'/> - <machine type='tcg' name='virt-2.7' maxCpus='255'/> - <machine type='tcg' name='kzm' maxCpus='1'/> - <machine type='tcg' name='virt-2.8' maxCpus='255'/> - <machine type='tcg' name='realview-eb-mpcore' maxCpus='4'/> - <machine type='tcg' name='musca-a' maxCpus='2'/> - <machine type='tcg' name='mcimx7d-sabre' maxCpus='2'/> - <machine type='tcg' name='sx1' maxCpus='1'/> - <machine type='tcg' name='sx1-v1' maxCpus='1'/> - <machine type='tcg' name='virt-2.6' maxCpus='255'/> - <machine type='tcg' name='cubieboard' maxCpus='1'/> - <machine type='tcg' name='virt-4.0' alias='virt' maxCpus='512'/> - <machine type='tcg' name='highbank' maxCpus='4'/> - <machine type='tcg' name='raspi2' maxCpus='4'/> - <machine type='tcg' name='raspi3' maxCpus='4'/> - <machine type='tcg' name='netduino2' maxCpus='1'/> - <machine type='tcg' name='terrier' maxCpus='1'/> - <machine type='tcg' name='n810' maxCpus='1'/> - <machine type='tcg' name='mainstone' maxCpus='1'/> - <machine type='tcg' name='palmetto-bmc' maxCpus='1'/> - <machine type='tcg' name='sabrelite' maxCpus='4'/> - <machine type='tcg' name='midway' maxCpus='4'/> - <machine type='tcg' name='romulus-bmc' maxCpus='1'/> - <machine type='tcg' name='cheetah' maxCpus='1'/> - <machine type='tcg' name='tosa' maxCpus='1'/> - <machine type='tcg' name='borzoi' maxCpus='1'/> - <machine type='tcg' name='versatileab' maxCpus='1'/> - <machine type='tcg' name='lm3s6965evb' maxCpus='1'/> - <machine type='tcg' name='n800' maxCpus='1'/> - <machine type='tcg' name='virt-2.10' maxCpus='255'/> - <machine type='tcg' name='virt-2.11' maxCpus='255'/> - <machine type='tcg' name='connex' maxCpus='1'/> - <machine type='tcg' name='virt-2.12' maxCpus='255'/> - <machine type='tcg' name='microbit' maxCpus='1'/> - <machine type='tcg' name='witherspoon-bmc' maxCpus='1'/> - <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1'/> - <machine type='tcg' name='mps2-an385' maxCpus='1'/> - <machine type='tcg' name='vexpress-a9' maxCpus='4'/> - <machine type='tcg' name='mps2-an521' maxCpus='2'/> - <machine type='tcg' name='mcimx6ul-evk' maxCpus='1'/> - <machine type='tcg' name='vexpress-a15' maxCpus='4'/> - <machine type='tcg' name='xlnx-zcu102' maxCpus='6'/> - <machine type='tcg' name='virt-3.1' maxCpus='512'/> - <machine type='tcg' name='canon-a1100' maxCpus='1'/> - <machine type='tcg' name='lm3s811evb' maxCpus='1'/> + <machine type='tcg' name='integratorcp' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='nuri' maxCpus='2' numaMemSupported='yes'/> + <machine type='tcg' name='mps2-an511' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='verdex' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='mps2-an505' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-3.0' maxCpus='512' numaMemSupported='yes'/> + <machine type='tcg' name='ast2500-evb' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='smdkc210' maxCpus='2' numaMemSupported='yes'/> + <machine type='tcg' name='collie' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='xlnx-versal-virt' maxCpus='2' numaMemSupported='yes'/> + <machine type='tcg' name='imx25-pdk' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='spitz' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='musca-b1' maxCpus='2' numaMemSupported='yes'/> + <machine type='tcg' name='realview-pbx-a9' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='realview-eb' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='realview-pb-a8' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='versatilepb' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='emcraft-sf2' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.9' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='musicpal' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='z2' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='akita' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.7' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='kzm' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.8' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='realview-eb-mpcore' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='musca-a' maxCpus='2' numaMemSupported='yes'/> + <machine type='tcg' name='mcimx7d-sabre' maxCpus='2' numaMemSupported='yes'/> + <machine type='tcg' name='sx1' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='sx1-v1' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.6' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='cubieboard' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-4.0' alias='virt' maxCpus='512' numaMemSupported='yes'/> + <machine type='tcg' name='highbank' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='raspi2' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='raspi3' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='netduino2' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='terrier' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='n810' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='mainstone' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='palmetto-bmc' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='sabrelite' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='midway' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='romulus-bmc' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='cheetah' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='tosa' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='borzoi' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='versatileab' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='lm3s6965evb' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='n800' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.10' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.11' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='connex' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.12' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='microbit' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='witherspoon-bmc' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='mps2-an385' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='vexpress-a9' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='mps2-an521' maxCpus='2' numaMemSupported='yes'/> + <machine type='tcg' name='mcimx6ul-evk' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='vexpress-a15' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='xlnx-zcu102' maxCpus='6' numaMemSupported='yes'/> + <machine type='tcg' name='virt-3.1' maxCpus='512' numaMemSupported='yes'/> + <machine type='tcg' name='canon-a1100' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='lm3s811evb' maxCpus='1' numaMemSupported='yes'/> <gic version='3' kernel='yes' emulated='yes'/> <gic version='2' kernel='no' emulated='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml index f4294436a8..582cbdc8c2 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -623,34 +623,34 @@ <cpu type='kvm' name='750_v3.1'/> <cpu type='kvm' name='power8e_v2.1'/> <cpu type='kvm' name='mpc8568e'/> - <machine type='kvm' name='pseries-4.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/> - <machine type='kvm' name='ref405ep' maxCpus='1'/> - <machine type='kvm' name='sam460ex' maxCpus='1'/> - <machine type='kvm' name='virtex-ml507' maxCpus='1'/> - <machine type='kvm' name='powernv' maxCpus='2048'/> - <machine type='kvm' name='ppce500' maxCpus='32'/> - <machine type='kvm' name='mpc8544ds' maxCpus='15'/> - <machine type='kvm' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='bamboo' maxCpus='1'/> - <machine type='kvm' name='g3beige' maxCpus='1'/> - <machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='prep' maxCpus='1'/> - <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='mac99' maxCpus='1'/> - <machine type='kvm' name='pseries-2.6' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.4' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.5' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.2' maxCpus='1024'/> - <machine type='kvm' name='taihu' maxCpus='1'/> - <machine type='kvm' name='pseries-2.3' maxCpus='1024'/> - <machine type='kvm' name='pseries-2.1' maxCpus='1024'/> - <machine type='kvm' name='40p' maxCpus='1'/> + <machine type='kvm' name='pseries-4.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='ref405ep' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='sam460ex' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='powernv' maxCpus='2048' numaMemSupported='yes'/> + <machine type='kvm' name='ppce500' maxCpus='32' numaMemSupported='yes'/> + <machine type='kvm' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='bamboo' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='g3beige' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='prep' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='mac99' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='taihu' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/> + <machine type='kvm' name='40p' maxCpus='1' numaMemSupported='yes'/> <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/> <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/> <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/> @@ -1088,32 +1088,32 @@ <cpu type='tcg' name='750_v3.1'/> <cpu type='tcg' name='power8e_v2.1'/> <cpu type='tcg' name='mpc8568e'/> - <machine type='tcg' name='pseries-4.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/> - <machine type='tcg' name='ref405ep' maxCpus='1'/> - <machine type='tcg' name='sam460ex' maxCpus='1'/> - <machine type='tcg' name='virtex-ml507' maxCpus='1'/> - <machine type='tcg' name='powernv' maxCpus='2048'/> - <machine type='tcg' name='ppce500' maxCpus='32'/> - <machine type='tcg' name='mpc8544ds' maxCpus='15'/> - <machine type='tcg' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='bamboo' maxCpus='1'/> - <machine type='tcg' name='g3beige' maxCpus='1'/> - <machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='prep' maxCpus='1'/> - <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='mac99' maxCpus='1'/> - <machine type='tcg' name='pseries-2.6' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.4' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.5' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.2' maxCpus='1024'/> - <machine type='tcg' name='taihu' maxCpus='1'/> - <machine type='tcg' name='pseries-2.3' maxCpus='1024'/> - <machine type='tcg' name='pseries-2.1' maxCpus='1024'/> - <machine type='tcg' name='40p' maxCpus='1'/> + <machine type='tcg' name='pseries-4.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='ref405ep' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='sam460ex' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='powernv' maxCpus='2048' numaMemSupported='yes'/> + <machine type='tcg' name='ppce500' maxCpus='32' numaMemSupported='yes'/> + <machine type='tcg' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='bamboo' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='g3beige' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='prep' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='mac99' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='taihu' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/> + <machine type='tcg' name='40p' maxCpus='1' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index f5c9d7f83e..199911d254 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -178,9 +178,9 @@ <microcodeVersion>0</microcodeVersion> <package>v4.0.0</package> <arch>riscv32</arch> - <machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes'/> - <machine type='tcg' name='virt' maxCpus='8'/> - <machine type='tcg' name='sifive_u' maxCpus='4'/> - <machine type='tcg' name='sifive_e' maxCpus='1'/> - <machine type='tcg' name='spike_v1.9.1' maxCpus='1'/> + <machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='virt' maxCpus='8' numaMemSupported='yes'/> + <machine type='tcg' name='sifive_u' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='sifive_e' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='spike_v1.9.1' maxCpus='1' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 538ce225f8..4ddb79d2f8 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -178,9 +178,9 @@ <microcodeVersion>0</microcodeVersion> <package>v4.0.0</package> <arch>riscv64</arch> - <machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes'/> - <machine type='tcg' name='virt' maxCpus='8'/> - <machine type='tcg' name='sifive_u' maxCpus='4'/> - <machine type='tcg' name='sifive_e' maxCpus='1'/> - <machine type='tcg' name='spike_v1.9.1' maxCpus='1'/> + <machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='virt' maxCpus='8' numaMemSupported='yes'/> + <machine type='tcg' name='sifive_u' maxCpus='4' numaMemSupported='yes'/> + <machine type='tcg' name='sifive_e' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='spike_v1.9.1' maxCpus='1' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml index 60d3a942be..d04129c327 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -252,18 +252,18 @@ <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/> <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/> - <machine type='kvm' name='s390-ccw-virtio-4.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/> - <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/> - <machine type='kvm' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/> + <machine type='kvm' name='s390-ccw-virtio-4.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='kvm' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> <hostCPU type='tcg' model='zEC12.2-base' migratability='no'> <property name='dateh2' type='boolean' value='false'/> <property name='aen' type='boolean' value='true'/> @@ -2900,16 +2900,16 @@ <blocker name='kmac-dea'/> <blocker name='hfpm'/> </cpu> - <machine type='tcg' name='s390-ccw-virtio-4.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/> - <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/> - <machine type='tcg' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/> + <machine type='tcg' name='s390-ccw-virtio-4.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> + <machine type='tcg' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index 9f45fe6359..bf7735caf3 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -670,47 +670,47 @@ <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='kvm' name='pc-i440fx-4.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-4.0' alias='q35' hotplugCpus='yes' maxCpus='288'/> + <machine type='kvm' name='pc-i440fx-4.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-4.0' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> <hostCPU type='tcg' model='base' migratability='yes'> <property name='phys-bits' type='number' value='0'/> <property name='core-id' type='number' value='-1'/> @@ -1381,45 +1381,45 @@ <blocker name='3dnowprefetch'/> </cpu> <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='tcg' name='pc-i440fx-4.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-4.0' alias='q35' hotplugCpus='yes' maxCpus='288'/> + <machine type='tcg' name='pc-i440fx-4.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-4.0' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index 9ad50bc2b5..8ce0f80e8a 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -846,50 +846,50 @@ <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='kvm' name='pc-i440fx-4.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-q35-4.1' alias='q35' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288'/> - <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> + <machine type='kvm' name='pc-i440fx-4.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-4.1' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> <hostCPU type='tcg' model='base' migratability='yes'> <property name='cmov' type='boolean' value='true' migratable='yes'/> <property name='ia64' type='boolean' value='false'/> @@ -1950,48 +1950,48 @@ </cpu> <cpu type='tcg' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/> <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='tcg' name='pc-i440fx-4.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-q35-4.1' alias='q35' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288'/> - <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/> - <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> + <machine type='tcg' name='pc-i440fx-4.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-4.1' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 7aca4fe022..154f70443e 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -252,7 +252,7 @@ <machine type='kvm' name='mps2-an511' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> <machine type='kvm' name='mps2-an505' maxCpus='1' defaultCPU='cortex-m33-arm-cpu'/> <machine type='kvm' name='verdex' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/> - <machine type='kvm' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='ast2500-evb' maxCpus='2'/> <machine type='kvm' name='smdkc210' maxCpus='2'/> <machine type='kvm' name='collie' maxCpus='1' defaultCPU='sa1110-arm-cpu'/> @@ -265,26 +265,26 @@ <machine type='kvm' name='versatilepb' maxCpus='1' defaultCPU='arm926-arm-cpu'/> <machine type='kvm' name='realview-pb-a8' maxCpus='1' defaultCPU='cortex-a8-arm-cpu'/> <machine type='kvm' name='emcraft-sf2' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> - <machine type='kvm' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='musicpal' maxCpus='1' defaultCPU='arm926-arm-cpu'/> - <machine type='kvm' name='sbsa-ref' maxCpus='512' defaultCPU='cortex-a57-arm-cpu'/> + <machine type='kvm' name='sbsa-ref' maxCpus='512' defaultCPU='cortex-a57-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='z2' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/> <machine type='kvm' name='akita' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/> - <machine type='kvm' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='kzm' maxCpus='1'/> <machine type='kvm' name='swift-bmc' maxCpus='2'/> - <machine type='kvm' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='realview-eb-mpcore' maxCpus='4' defaultCPU='arm11mpcore-arm-cpu'/> <machine type='kvm' name='musca-a' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/> <machine type='kvm' name='mcimx7d-sabre' maxCpus='2'/> <machine type='kvm' name='sx1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/> - <machine type='kvm' name='virt-4.2' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-4.2' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='sx1-v1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/> - <machine type='kvm' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='cubieboard' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/> - <machine type='kvm' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='highbank' maxCpus='4'/> - <machine type='kvm' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='raspi2' maxCpus='4'/> <machine type='kvm' name='raspi3' maxCpus='4'/> <machine type='kvm' name='netduino2' maxCpus='1'/> @@ -301,10 +301,10 @@ <machine type='kvm' name='versatileab' maxCpus='1' defaultCPU='arm926-arm-cpu'/> <machine type='kvm' name='lm3s6965evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> <machine type='kvm' name='n800' maxCpus='1' defaultCPU='arm1136-r2-arm-cpu'/> - <machine type='kvm' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> - <machine type='kvm' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='connex' maxCpus='1'/> - <machine type='kvm' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='microbit' maxCpus='1'/> <machine type='kvm' name='witherspoon-bmc' maxCpus='2'/> <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/> @@ -315,7 +315,7 @@ <machine type='kvm' name='mcimx6ul-evk' maxCpus='1'/> <machine type='kvm' name='vexpress-a15' maxCpus='4' defaultCPU='cortex-a15-arm-cpu'/> <machine type='kvm' name='xlnx-zcu102' maxCpus='6'/> - <machine type='kvm' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='canon-a1100' maxCpus='1'/> <machine type='kvm' name='lm3s811evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> <hostCPU type='tcg' model='max' migratability='no'> @@ -381,7 +381,7 @@ <machine type='tcg' name='mps2-an511' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> <machine type='tcg' name='mps2-an505' maxCpus='1' defaultCPU='cortex-m33-arm-cpu'/> <machine type='tcg' name='verdex' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/> - <machine type='tcg' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='ast2500-evb' maxCpus='2'/> <machine type='tcg' name='smdkc210' maxCpus='2'/> <machine type='tcg' name='collie' maxCpus='1' defaultCPU='sa1110-arm-cpu'/> @@ -394,26 +394,26 @@ <machine type='tcg' name='versatilepb' maxCpus='1' defaultCPU='arm926-arm-cpu'/> <machine type='tcg' name='realview-pb-a8' maxCpus='1' defaultCPU='cortex-a8-arm-cpu'/> <machine type='tcg' name='emcraft-sf2' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> - <machine type='tcg' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='musicpal' maxCpus='1' defaultCPU='arm926-arm-cpu'/> - <machine type='tcg' name='sbsa-ref' maxCpus='512' defaultCPU='cortex-a57-arm-cpu'/> + <machine type='tcg' name='sbsa-ref' maxCpus='512' defaultCPU='cortex-a57-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='z2' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/> <machine type='tcg' name='akita' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/> - <machine type='tcg' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='kzm' maxCpus='1'/> <machine type='tcg' name='swift-bmc' maxCpus='2'/> - <machine type='tcg' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='realview-eb-mpcore' maxCpus='4' defaultCPU='arm11mpcore-arm-cpu'/> <machine type='tcg' name='musca-a' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/> <machine type='tcg' name='mcimx7d-sabre' maxCpus='2'/> <machine type='tcg' name='sx1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/> - <machine type='tcg' name='virt-4.2' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-4.2' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='sx1-v1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/> - <machine type='tcg' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='cubieboard' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/> - <machine type='tcg' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='highbank' maxCpus='4'/> - <machine type='tcg' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='raspi2' maxCpus='4'/> <machine type='tcg' name='raspi3' maxCpus='4'/> <machine type='tcg' name='netduino2' maxCpus='1'/> @@ -430,10 +430,10 @@ <machine type='tcg' name='versatileab' maxCpus='1' defaultCPU='arm926-arm-cpu'/> <machine type='tcg' name='lm3s6965evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> <machine type='tcg' name='n800' maxCpus='1' defaultCPU='arm1136-r2-arm-cpu'/> - <machine type='tcg' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> - <machine type='tcg' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='connex' maxCpus='1'/> - <machine type='tcg' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='microbit' maxCpus='1'/> <machine type='tcg' name='witherspoon-bmc' maxCpus='2'/> <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/> @@ -443,7 +443,7 @@ <machine type='tcg' name='mcimx6ul-evk' maxCpus='1'/> <machine type='tcg' name='vexpress-a15' maxCpus='4' defaultCPU='cortex-a15-arm-cpu'/> <machine type='tcg' name='xlnx-zcu102' maxCpus='6'/> - <machine type='tcg' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='canon-a1100' maxCpus='1'/> <machine type='tcg' name='lm3s811evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> <gic version='3' kernel='yes' emulated='yes'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index a68786ddc8..eeec181f62 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -628,34 +628,34 @@ <cpu type='kvm' name='750_v3.1'/> <cpu type='kvm' name='power8e_v2.1'/> <cpu type='kvm' name='mpc8568e'/> - <machine type='kvm' name='pseries-4.2' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='host-powerpc64-cpu'/> + <machine type='kvm' name='pseries-4.2' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='ref405ep' maxCpus='1'/> <machine type='kvm' name='sam460ex' maxCpus='1' defaultCPU='460exb-powerpc64-cpu'/> <machine type='kvm' name='virtex-ml507' maxCpus='1' defaultCPU='440-xilinx-powerpc64-cpu'/> <machine type='kvm' name='ppce500' maxCpus='32' defaultCPU='e500v2_v30-powerpc64-cpu'/> <machine type='kvm' name='mpc8544ds' maxCpus='15' defaultCPU='e500v2_v30-powerpc64-cpu'/> - <machine type='kvm' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> + <machine type='kvm' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='bamboo' maxCpus='1' defaultCPU='440epb-powerpc64-cpu'/> <machine type='kvm' name='g3beige' maxCpus='1' defaultCPU='750_v3.1-powerpc64-cpu'/> - <machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> + <machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='prep' maxCpus='1' defaultCPU='602-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> + <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='mac99' maxCpus='1' defaultCPU='970fx_v3.1-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.6' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.4' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.5' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.2' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> + <machine type='kvm' name='pseries-2.6' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.4' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.5' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.2' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='taihu' maxCpus='1'/> - <machine type='kvm' name='pseries-2.3' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.1' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> + <machine type='kvm' name='pseries-2.3' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.1' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='powernv8' maxCpus='2048' defaultCPU='power8_v2.0-powerpc64-cpu'/> <machine type='kvm' name='powernv9' alias='powernv' maxCpus='2048' defaultCPU='power9_v2.0-powerpc64-cpu'/> <machine type='kvm' name='40p' maxCpus='1' defaultCPU='604-powerpc64-cpu'/> @@ -1096,34 +1096,34 @@ <cpu type='tcg' name='750_v3.1'/> <cpu type='tcg' name='power8e_v2.1'/> <cpu type='tcg' name='mpc8568e'/> - <machine type='tcg' name='pseries-4.2' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='power9_v2.0-powerpc64-cpu'/> + <machine type='tcg' name='pseries-4.2' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='power9_v2.0-powerpc64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='ref405ep' maxCpus='1'/> <machine type='tcg' name='sam460ex' maxCpus='1' defaultCPU='460exb-powerpc64-cpu'/> <machine type='tcg' name='virtex-ml507' maxCpus='1' defaultCPU='440-xilinx-powerpc64-cpu'/> <machine type='tcg' name='ppce500' maxCpus='32' defaultCPU='e500v2_v30-powerpc64-cpu'/> <machine type='tcg' name='mpc8544ds' maxCpus='15' defaultCPU='e500v2_v30-powerpc64-cpu'/> - <machine type='tcg' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> + <machine type='tcg' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='bamboo' maxCpus='1' defaultCPU='440epb-powerpc64-cpu'/> <machine type='tcg' name='g3beige' maxCpus='1' defaultCPU='750_v3.1-powerpc64-cpu'/> - <machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> + <machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='prep' maxCpus='1' defaultCPU='602-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> + <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='mac99' maxCpus='1' defaultCPU='970fx_v3.1-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.6' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.4' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.5' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> - <machine type='tcg' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu'/> - <machine type='tcg' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.2' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> + <machine type='tcg' name='pseries-2.6' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.4' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.5' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.2' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='taihu' maxCpus='1'/> - <machine type='tcg' name='pseries-2.3' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.1' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> + <machine type='tcg' name='pseries-2.3' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.1' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='powernv8' maxCpus='2048' defaultCPU='power8_v2.0-powerpc64-cpu'/> <machine type='tcg' name='powernv9' alias='powernv' maxCpus='2048' defaultCPU='power9_v2.0-powerpc64-cpu'/> <machine type='tcg' name='40p' maxCpus='1' defaultCPU='604-powerpc64-cpu'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 3935be4813..50ed35f092 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -1100,53 +1100,53 @@ <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='kvm' name='pc-i440fx-4.2' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-4.2' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine type='kvm' name='pc-i440fx-4.2' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-4.2' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> <hostCPU type='tcg' model='base' migratability='yes'> <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/> <property name='cmov' type='boolean' value='true' migratable='yes'/> @@ -2563,51 +2563,51 @@ </cpu> <cpu type='tcg' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/> <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='tcg' name='pc-i440fx-4.2' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-4.2' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine type='tcg' name='pc-i440fx-4.2' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-4.2' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <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'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 7649153cfd..9b24490137 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -259,7 +259,7 @@ <cpu type='kvm' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/> <cpu type='kvm' name='pxa262' typename='pxa262-arm-cpu'/> <machine type='kvm' name='integratorcp' maxCpus='1' defaultCPU='arm926-arm-cpu'/> - <machine type='kvm' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='mcimx7d-sabre' maxCpus='2'/> <machine type='kvm' name='imx25-pdk' maxCpus='1'/> <machine type='kvm' name='swift-bmc' maxCpus='2'/> @@ -267,26 +267,26 @@ <machine type='kvm' name='nuri' maxCpus='2'/> <machine type='kvm' name='z2' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/> <machine type='kvm' name='midway' maxCpus='4'/> - <machine type='kvm' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> - <machine type='kvm' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='mainstone' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/> <machine type='kvm' name='cheetah' maxCpus='1' defaultCPU='ti925t-arm-cpu'/> <machine type='kvm' name='sbsa-ref' maxCpus='512' defaultCPU='cortex-a57-arm-cpu'/> <machine type='kvm' name='spitz' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/> <machine type='kvm' name='witherspoon-bmc' maxCpus='2'/> - <machine type='kvm' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='netduino2' maxCpus='1'/> <machine type='kvm' name='realview-eb-mpcore' maxCpus='4' defaultCPU='arm11mpcore-arm-cpu'/> <machine type='kvm' name='realview-pbx-a9' maxCpus='4' defaultCPU='cortex-a9-arm-cpu'/> <machine type='kvm' name='xlnx-zcu102' maxCpus='6'/> <machine type='kvm' name='connex' maxCpus='1'/> - <machine type='kvm' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='cubieboard' maxCpus='1' defaultCPU='cortex-a8-arm-cpu'/> <machine type='kvm' name='romulus-bmc' maxCpus='2'/> <machine type='kvm' name='vexpress-a15' maxCpus='4' defaultCPU='cortex-a15-arm-cpu'/> <machine type='kvm' name='microbit' maxCpus='1'/> <machine type='kvm' name='xlnx-versal-virt' maxCpus='2'/> - <machine type='kvm' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='palmetto-bmc' maxCpus='2'/> <machine type='kvm' name='lm3s811evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> <machine type='kvm' name='collie' maxCpus='1' defaultCPU='sa1110-arm-cpu'/> @@ -294,7 +294,7 @@ <machine type='kvm' name='lm3s6965evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> <machine type='kvm' name='raspi2' maxCpus='4'/> <machine type='kvm' name='verdex' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/> - <machine type='kvm' name='virt-4.2' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-4.2' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='netduinoplus2' maxCpus='1'/> <machine type='kvm' name='mps2-an505' maxCpus='1' defaultCPU='cortex-m33-arm-cpu'/> <machine type='kvm' name='n800' maxCpus='1' defaultCPU='arm1136-r2-arm-cpu'/> @@ -310,13 +310,13 @@ <machine type='kvm' name='mcimx6ul-evk' maxCpus='1'/> <machine type='kvm' name='sx1-v1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/> <machine type='kvm' name='musicpal' maxCpus='1' defaultCPU='arm926-arm-cpu'/> - <machine type='kvm' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='kzm' maxCpus='1'/> <machine type='kvm' name='versatileab' maxCpus='1' defaultCPU='arm926-arm-cpu'/> <machine type='kvm' name='emcraft-sf2' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/> - <machine type='kvm' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> - <machine type='kvm' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='versatilepb' maxCpus='1' defaultCPU='arm926-arm-cpu'/> <machine type='kvm' name='smdkc210' maxCpus='2'/> <machine type='kvm' name='sabrelite' maxCpus='4'/> @@ -324,13 +324,13 @@ <machine type='kvm' name='tacoma-bmc' maxCpus='2'/> <machine type='kvm' name='sx1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/> <machine type='kvm' name='highbank' maxCpus='4'/> - <machine type='kvm' name='virt-5.0' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-5.0' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='musca-a' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/> <machine type='kvm' name='musca-b1' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/> <machine type='kvm' name='realview-eb' maxCpus='1' defaultCPU='arm926-arm-cpu'/> <machine type='kvm' name='n810' maxCpus='1' defaultCPU='arm1136-r2-arm-cpu'/> - <machine type='kvm' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> - <machine type='kvm' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='kvm' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='kvm' name='mps2-an521' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/> <machine type='kvm' name='terrier' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/> <hostCPU type='tcg' model='max' migratability='no'> @@ -393,7 +393,7 @@ <cpu type='tcg' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/> <cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/> <machine type='tcg' name='integratorcp' maxCpus='1' defaultCPU='arm926-arm-cpu'/> - <machine type='tcg' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='mcimx7d-sabre' maxCpus='2'/> <machine type='tcg' name='imx25-pdk' maxCpus='1'/> <machine type='tcg' name='swift-bmc' maxCpus='2'/> @@ -401,26 +401,26 @@ <machine type='tcg' name='nuri' maxCpus='2'/> <machine type='tcg' name='z2' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/> <machine type='tcg' name='midway' maxCpus='4'/> - <machine type='tcg' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> - <machine type='tcg' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='mainstone' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/> <machine type='tcg' name='cheetah' maxCpus='1' defaultCPU='ti925t-arm-cpu'/> <machine type='tcg' name='sbsa-ref' maxCpus='512' defaultCPU='cortex-a57-arm-cpu'/> <machine type='tcg' name='spitz' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/> <machine type='tcg' name='witherspoon-bmc' maxCpus='2'/> - <machine type='tcg' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='netduino2' maxCpus='1'/> <machine type='tcg' name='realview-eb-mpcore' maxCpus='4' defaultCPU='arm11mpcore-arm-cpu'/> <machine type='tcg' name='realview-pbx-a9' maxCpus='4' defaultCPU='cortex-a9-arm-cpu'/> <machine type='tcg' name='xlnx-zcu102' maxCpus='6'/> <machine type='tcg' name='connex' maxCpus='1'/> - <machine type='tcg' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='cubieboard' maxCpus='1' defaultCPU='cortex-a8-arm-cpu'/> <machine type='tcg' name='romulus-bmc' maxCpus='2'/> <machine type='tcg' name='vexpress-a15' maxCpus='4' defaultCPU='cortex-a15-arm-cpu'/> <machine type='tcg' name='microbit' maxCpus='1'/> <machine type='tcg' name='xlnx-versal-virt' maxCpus='2'/> - <machine type='tcg' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='palmetto-bmc' maxCpus='2'/> <machine type='tcg' name='lm3s811evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> <machine type='tcg' name='collie' maxCpus='1' defaultCPU='sa1110-arm-cpu'/> @@ -428,7 +428,7 @@ <machine type='tcg' name='lm3s6965evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> <machine type='tcg' name='raspi2' maxCpus='4'/> <machine type='tcg' name='verdex' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/> - <machine type='tcg' name='virt-4.2' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-4.2' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='netduinoplus2' maxCpus='1'/> <machine type='tcg' name='mps2-an505' maxCpus='1' defaultCPU='cortex-m33-arm-cpu'/> <machine type='tcg' name='n800' maxCpus='1' defaultCPU='arm1136-r2-arm-cpu'/> @@ -444,13 +444,13 @@ <machine type='tcg' name='mcimx6ul-evk' maxCpus='1'/> <machine type='tcg' name='sx1-v1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/> <machine type='tcg' name='musicpal' maxCpus='1' defaultCPU='arm926-arm-cpu'/> - <machine type='tcg' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='kzm' maxCpus='1'/> <machine type='tcg' name='versatileab' maxCpus='1' defaultCPU='arm926-arm-cpu'/> <machine type='tcg' name='emcraft-sf2' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/> - <machine type='tcg' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> - <machine type='tcg' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='versatilepb' maxCpus='1' defaultCPU='arm926-arm-cpu'/> <machine type='tcg' name='smdkc210' maxCpus='2'/> <machine type='tcg' name='sabrelite' maxCpus='4'/> @@ -458,13 +458,13 @@ <machine type='tcg' name='tacoma-bmc' maxCpus='2'/> <machine type='tcg' name='sx1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/> <machine type='tcg' name='highbank' maxCpus='4'/> - <machine type='tcg' name='virt-5.0' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-5.0' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='musca-a' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/> <machine type='tcg' name='musca-b1' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/> <machine type='tcg' name='realview-eb' maxCpus='1' defaultCPU='arm926-arm-cpu'/> <machine type='tcg' name='n810' maxCpus='1' defaultCPU='arm1136-r2-arm-cpu'/> - <machine type='tcg' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> - <machine type='tcg' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine type='tcg' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/> <machine type='tcg' name='mps2-an521' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/> <machine type='tcg' name='terrier' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/> <gic version='3' kernel='yes' emulated='yes'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index c8cc07d954..69e5b4c8fa 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -646,36 +646,36 @@ <cpu type='kvm' name='970_v2.2'/> <cpu type='kvm' name='mpc8533e_v10'/> <cpu type='kvm' name='mpc8379'/> - <machine type='kvm' name='pseries-5.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='host-powerpc64-cpu'/> + <machine type='kvm' name='pseries-5.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='powernv9' alias='powernv' maxCpus='2048' defaultCPU='power9_v2.0-powerpc64-cpu'/> <machine type='kvm' name='g3beige' maxCpus='1' defaultCPU='750_v3.1-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> + <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='ref405ep' maxCpus='1'/> - <machine type='kvm' name='pseries-2.2' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> + <machine type='kvm' name='pseries-2.2' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='40p' maxCpus='1' defaultCPU='604-powerpc64-cpu'/> - <machine type='kvm' name='pseries-4.2' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.3' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.6' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> + <machine type='kvm' name='pseries-4.2' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.3' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.6' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='sam460ex' maxCpus='1' defaultCPU='460exb-powerpc64-cpu'/> <machine type='kvm' name='virtex-ml507' maxCpus='1' defaultCPU='440-xilinx-powerpc64-cpu'/> - <machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> + <machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='bamboo' maxCpus='1' defaultCPU='440epb-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.1' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> + <machine type='kvm' name='pseries-2.1' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='taihu' maxCpus='1'/> - <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.4' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> + <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.4' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='mpc8544ds' maxCpus='15' defaultCPU='e500v2_v30-powerpc64-cpu'/> - <machine type='kvm' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> + <machine type='kvm' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='powernv8' maxCpus='2048' defaultCPU='power8_v2.0-powerpc64-cpu'/> <machine type='kvm' name='powernv10' maxCpus='2048' defaultCPU='power10_v1.0-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-2.5' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> - <machine type='kvm' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/> + <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-2.5' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='mac99' maxCpus='1' defaultCPU='970fx_v3.1-powerpc64-cpu'/> <machine type='kvm' name='ppce500' maxCpus='32' defaultCPU='e500v2_v30-powerpc64-cpu'/> <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/> @@ -1117,36 +1117,36 @@ <cpu type='tcg' name='970_v2.2'/> <cpu type='tcg' name='mpc8533e_v10'/> <cpu type='tcg' name='mpc8379'/> - <machine type='tcg' name='pseries-5.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='power9_v2.0-powerpc64-cpu'/> + <machine type='tcg' name='pseries-5.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='power9_v2.0-powerpc64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='powernv9' alias='powernv' maxCpus='2048' defaultCPU='power9_v2.0-powerpc64-cpu'/> <machine type='tcg' name='g3beige' maxCpus='1' defaultCPU='750_v3.1-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> + <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='ref405ep' maxCpus='1'/> - <machine type='tcg' name='pseries-2.2' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> + <machine type='tcg' name='pseries-2.2' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='40p' maxCpus='1' defaultCPU='604-powerpc64-cpu'/> - <machine type='tcg' name='pseries-4.2' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.3' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.6' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> + <machine type='tcg' name='pseries-4.2' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.3' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.6' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='sam460ex' maxCpus='1' defaultCPU='460exb-powerpc64-cpu'/> <machine type='tcg' name='virtex-ml507' maxCpus='1' defaultCPU='440-xilinx-powerpc64-cpu'/> - <machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> - <machine type='tcg' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu'/> + <machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='bamboo' maxCpus='1' defaultCPU='440epb-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.1' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> + <machine type='tcg' name='pseries-2.1' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='taihu' maxCpus='1'/> - <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.4' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> + <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.4' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='mpc8544ds' maxCpus='15' defaultCPU='e500v2_v30-powerpc64-cpu'/> - <machine type='tcg' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu'/> + <machine type='tcg' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='powernv8' maxCpus='2048' defaultCPU='power8_v2.0-powerpc64-cpu'/> <machine type='tcg' name='powernv10' maxCpus='2048' defaultCPU='power10_v1.0-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> - <machine type='tcg' name='pseries-2.5' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> - <machine type='tcg' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> + <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-2.5' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='mac99' maxCpus='1' defaultCPU='970fx_v3.1-powerpc64-cpu'/> <machine type='tcg' name='ppce500' maxCpus='32' defaultCPU='e500v2_v30-powerpc64-cpu'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index e28e87fd23..ba39fef713 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -1225,51 +1225,51 @@ <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='kvm' name='pc-i440fx-5.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-5.0' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine type='kvm' name='pc-i440fx-5.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-5.0' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> <hostCPU type='tcg' model='base' migratability='yes'> <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/> <property name='cmov' type='boolean' value='true' migratable='yes'/> @@ -2867,49 +2867,49 @@ </cpu> <cpu type='tcg' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/> <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='tcg' name='pc-i440fx-5.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-5.0' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine type='tcg' name='pc-i440fx-5.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-5.0' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <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'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 8c20b5fe5c..c2bc121f73 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -1328,51 +1328,51 @@ </cpu> <cpu type='kvm' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='kvm' name='pc-i440fx-5.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-5.0' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine type='kvm' name='pc-i440fx-5.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-5.0' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> <machine type='kvm' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> <hostCPU type='tcg' model='base' migratability='yes'> <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/> <property name='cmov' type='boolean' value='true' migratable='yes'/> @@ -2970,49 +2970,49 @@ </cpu> <cpu type='tcg' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/> <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/> - <machine type='tcg' name='pc-i440fx-5.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-5.0' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine type='tcg' name='pc-i440fx-5.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-5.0' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> <machine type='tcg' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> - <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/> + <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'/> </qemuCaps> diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 9f9eb4033c..f36e49744f 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -344,7 +344,8 @@ int qemuTestCapsCacheInsert(virFileCachePtr cache, NULL, 0, false, - false); + false, + true); virQEMUCapsSet(tmpCaps, QEMU_CAPS_TCG); } for (j = 0; kvm_machines[i][j] != NULL; j++) { @@ -355,7 +356,8 @@ int qemuTestCapsCacheInsert(virFileCachePtr cache, NULL, 0, false, - false); + false, + true); virQEMUCapsSet(tmpCaps, QEMU_CAPS_KVM); } } -- 2.26.2
On a Thursday in 2020, Michal Privoznik wrote:
There is 'numa-mem-supported' machine attribute which specifies whether '-numa mem=' is supported. Store it in our capabilities as it will be used in later commits when building the command line.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 44 ++- src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_capspriv.h | 3 +- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 11 + .../caps_1.5.3.x86_64.xml | 60 ++-- .../caps_1.6.0.x86_64.xml | 68 ++--- .../caps_1.7.0.x86_64.xml | 76 ++--- .../caps_2.1.1.x86_64.xml | 92 +++--- .../caps_2.10.0.aarch64.xml | 204 +++++++------- .../caps_2.10.0.ppc64.xml | 84 +++--- .../caps_2.10.0.s390x.xml | 28 +- .../caps_2.10.0.x86_64.xml | 140 +++++----- .../caps_2.11.0.s390x.xml | 32 +-- .../caps_2.11.0.x86_64.xml | 140 +++++----- .../caps_2.12.0.aarch64.xml | 228 +++++++-------- .../caps_2.12.0.ppc64.xml | 100 +++---- .../caps_2.12.0.s390x.xml | 36 +-- .../caps_2.12.0.x86_64.xml | 148 +++++----- .../caps_2.4.0.x86_64.xml | 116 ++++---- .../caps_2.5.0.x86_64.xml | 124 ++++---- .../caps_2.6.0.aarch64.xml | 164 +++++------ .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 60 ++-- .../caps_2.6.0.x86_64.xml | 100 +++---- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 16 +- .../caps_2.7.0.x86_64.xml | 108 +++---- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 20 +- .../caps_2.8.0.x86_64.xml | 124 ++++---- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 80 +++--- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 24 +- .../caps_2.9.0.x86_64.xml | 132 ++++----- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 104 +++---- .../caps_3.0.0.riscv32.xml | 10 +- .../caps_3.0.0.riscv64.xml | 10 +- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 40 +-- .../caps_3.0.0.x86_64.xml | 156 +++++------ .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 108 +++---- .../caps_3.1.0.x86_64.xml | 164 +++++------ .../caps_4.0.0.aarch64.xml | 264 +++++++++--------- .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 112 ++++---- .../caps_4.0.0.riscv32.xml | 10 +- .../caps_4.0.0.riscv64.xml | 10 +- .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 48 ++-- .../caps_4.0.0.x86_64.xml | 164 +++++------ .../caps_4.1.0.x86_64.xml | 176 ++++++------ .../caps_4.2.0.aarch64.xml | 52 ++-- .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 72 ++--- .../caps_4.2.0.x86_64.xml | 184 ++++++------ .../caps_5.0.0.aarch64.xml | 52 ++-- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 76 ++--- .../caps_5.0.0.x86_64.xml | 176 ++++++------ .../caps_5.1.0.x86_64.xml | 176 ++++++------ tests/testutilsqemu.c | 6 +- 53 files changed, 2395 insertions(+), 2341 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
On a Thursday in 2020, Michal Privoznik wrote:
There is 'numa-mem-supported' machine attribute which specifies whether '-numa mem=' is supported. Store it in our capabilities as it will be used in later commits when building the command line.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 44 ++- src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_capspriv.h | 3 +- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 11 + .../caps_1.5.3.x86_64.xml | 60 ++-- .../caps_1.6.0.x86_64.xml | 68 ++--- .../caps_1.7.0.x86_64.xml | 76 ++--- .../caps_2.1.1.x86_64.xml | 92 +++--- .../caps_2.10.0.aarch64.xml | 204 +++++++------- .../caps_2.10.0.ppc64.xml | 84 +++--- .../caps_2.10.0.s390x.xml | 28 +- .../caps_2.10.0.x86_64.xml | 140 +++++----- .../caps_2.11.0.s390x.xml | 32 +-- .../caps_2.11.0.x86_64.xml | 140 +++++----- .../caps_2.12.0.aarch64.xml | 228 +++++++-------- .../caps_2.12.0.ppc64.xml | 100 +++---- .../caps_2.12.0.s390x.xml | 36 +-- .../caps_2.12.0.x86_64.xml | 148 +++++----- .../caps_2.4.0.x86_64.xml | 116 ++++---- .../caps_2.5.0.x86_64.xml | 124 ++++---- .../caps_2.6.0.aarch64.xml | 164 +++++------ .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 60 ++-- .../caps_2.6.0.x86_64.xml | 100 +++---- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 16 +- .../caps_2.7.0.x86_64.xml | 108 +++---- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 20 +- .../caps_2.8.0.x86_64.xml | 124 ++++---- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 80 +++--- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 24 +- .../caps_2.9.0.x86_64.xml | 132 ++++----- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 104 +++---- .../caps_3.0.0.riscv32.xml | 10 +- .../caps_3.0.0.riscv64.xml | 10 +- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 40 +-- .../caps_3.0.0.x86_64.xml | 156 +++++------ .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 108 +++---- .../caps_3.1.0.x86_64.xml | 164 +++++------ .../caps_4.0.0.aarch64.xml | 264 +++++++++--------- .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 112 ++++---- .../caps_4.0.0.riscv32.xml | 10 +- .../caps_4.0.0.riscv64.xml | 10 +- .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 48 ++-- .../caps_4.0.0.x86_64.xml | 164 +++++------ .../caps_4.1.0.x86_64.xml | 176 ++++++------ .../caps_4.2.0.aarch64.xml | 52 ++-- .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 72 ++--- .../caps_4.2.0.x86_64.xml | 184 ++++++------ .../caps_5.0.0.aarch64.xml | 52 ++-- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 76 ++--- .../caps_5.0.0.x86_64.xml | 176 ++++++------ .../caps_5.1.0.x86_64.xml | 176 ++++++------ tests/testutilsqemu.c | 6 +- 53 files changed, 2395 insertions(+), 2341 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7e711f22f8..2676fbab6f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -594,6 +594,7 @@ struct _virQEMUCapsMachineType { bool hotplugCpus; bool qemuDefault; char *defaultCPU; + bool numaMemSupported; };
typedef struct _virQEMUCapsHostCPUData virQEMUCapsHostCPUData; @@ -1869,6 +1870,7 @@ virQEMUCapsAccelCopyMachineTypes(virQEMUCapsAccelPtr dst, dst->machineTypes[i].maxCpus = src->machineTypes[i].maxCpus; dst->machineTypes[i].hotplugCpus = src->machineTypes[i].hotplugCpus; dst->machineTypes[i].qemuDefault = src->machineTypes[i].qemuDefault; + dst->machineTypes[i].numaMemSupported = src->machineTypes[i].numaMemSupported; } }
@@ -2510,6 +2512,28 @@ virQEMUCapsGetMachineDefaultCPU(virQEMUCapsPtr qemuCaps, }
+bool +virQEMUCapsGetMachineNumaMemSupported(virQEMUCapsPtr qemuCaps, + virDomainVirtType virtType, + const char *name) +{ + virQEMUCapsAccelPtr accel; + size_t i; +
+ if (!name) + return 0; +
The function returns bool, not int. Is it even possible to call it with a null machine name? Jano
+ accel = virQEMUCapsGetAccel(qemuCaps, virtType); + + for (i = 0; i < accel->nmachineTypes; i++) { + if (STREQ(accel->machineTypes[i].name, name)) + return accel->machineTypes[i].numaMemSupported; + } + + return false; +} + +
When building -numa command line there is a for() loop that builds '-numa memdev=' for each guest NUMA node. And also records in a local variable whether any of memory-object-* backends must be used to satisfy desired config. Well, instead of checking in each iteration whether corresponding capabilities are set, we can do swap if() and for() and check only once. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1783355 Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_command.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bfe70ed228..cf6c48d233 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7043,11 +7043,11 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, /* using of -numa memdev= cannot be combined with -numa mem=, thus we * need to check which approach to use */ - for (i = 0; i < ncells; i++) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_RAM) || - virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE) || - virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_MEMFD)) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_RAM) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_MEMFD)) { + for (i = 0; i < ncells; i++) { if ((rc = qemuBuildMemoryCellBackendStr(def, cfg, i, priv, &nodeBackends[i])) < 0) goto cleanup; -- 2.26.2
On a Thursday in 2020, Michal Privoznik wrote:
When building -numa command line there is a for() loop that builds '-numa memdev=' for each guest NUMA node. And also records in a local variable whether any of memory-object-* backends must be used to satisfy desired config. Well, instead of checking in each iteration whether corresponding capabilities are set, we can do swap if() and for() and check only once.
"Fixes" is confusing here, since this commit is a no-op.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_command.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
In previous commit we started tracking whether QEMU supports '-numa mem='. This is tied to the machine type because migration from '-numa mem=' to '-numa memdev' is impossible (or vice versa). But since it's tied to a machine type (where migration from one to another is also unsupported) we can allow QEMU to get rid of the deprecated command line. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_command.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index cf6c48d233..19c45cb4e3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7038,6 +7038,11 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, if (!virDomainNumatuneNodesetIsAvailable(def->numa, priv->autoNodeset)) goto cleanup; + if (!virQEMUCapsGetMachineNumaMemSupported(qemuCaps, + def->virtType, + def->os.machine)) + needBackend = true; + if (VIR_ALLOC_N(nodeBackends, ncells) < 0) goto cleanup; @@ -7055,6 +7060,10 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, if (rc == 0) needBackend = true; } + } else if (needBackend) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("numa not supported")); + goto cleanup; } if (!needBackend && -- 2.26.2
On a Thursday in 2020, Michal Privoznik wrote:
In previous commit we started tracking whether QEMU supports '-numa mem='. This is tied to the machine type because migration from '-numa mem=' to '-numa memdev' is impossible (or vice versa). But since it's tied to a machine type (where migration from one to another is also unsupported) we can allow QEMU to get rid of the deprecated command line.
(At least) this commit should have the bugzilla link.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_command.c | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index cf6c48d233..19c45cb4e3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7038,6 +7038,11 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, if (!virDomainNumatuneNodesetIsAvailable(def->numa, priv->autoNodeset)) goto cleanup;
+ if (!virQEMUCapsGetMachineNumaMemSupported(qemuCaps, + def->virtType, + def->os.machine)) + needBackend = true; + if (VIR_ALLOC_N(nodeBackends, ncells) < 0) goto cleanup;
@@ -7055,6 +7060,10 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, if (rc == 0) needBackend = true; } + } else if (needBackend) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("numa not supported"));
s/numa/NUMA/ Also, can we be more helpful, e.g. "NUMA without specified memory backing is not supported with this QEMU binary"
+ goto cleanup; }
Either way: Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Ján Tomko -
Michal Privoznik