[libvirt] [PATCH v2 22/31] qemu: Probe for default CPU types

QEMU 4.2.0 will report default CPU types used by each machine type and we will want to start using it. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - no change except for updated test results src/qemu/qemu_capabilities.c | 15 ++- src/qemu/qemu_monitor.c | 1 + src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 12 +++ .../caps_4.2.0.aarch64.xml | 94 +++++++++---------- .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 58 ++++++------ .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 28 +++--- .../caps_4.2.0.x86_64.xml | 92 +++++++++--------- 8 files changed, 163 insertions(+), 138 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2a32d575c9..33cd3491b2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -556,6 +556,7 @@ struct virQEMUCapsMachineType { unsigned int maxCpus; bool hotplugCpus; bool qemuDefault; + char *defaultCPU; }; typedef struct _virQEMUCapsHostCPUData virQEMUCapsHostCPUData; @@ -1638,7 +1639,8 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) ret->nmachineTypes = qemuCaps->nmachineTypes; for (i = 0; i < qemuCaps->nmachineTypes; i++) { if (VIR_STRDUP(ret->machineTypes[i].name, qemuCaps->machineTypes[i].name) < 0 || - VIR_STRDUP(ret->machineTypes[i].alias, qemuCaps->machineTypes[i].alias) < 0) + VIR_STRDUP(ret->machineTypes[i].alias, qemuCaps->machineTypes[i].alias) < 0 || + VIR_STRDUP(ret->machineTypes[i].defaultCPU, qemuCaps->machineTypes[i].defaultCPU) < 0) goto error; ret->machineTypes[i].maxCpus = qemuCaps->machineTypes[i].maxCpus; ret->machineTypes[i].hotplugCpus = qemuCaps->machineTypes[i].hotplugCpus; @@ -1673,6 +1675,7 @@ void virQEMUCapsDispose(void *obj) for (i = 0; i < qemuCaps->nmachineTypes; i++) { VIR_FREE(qemuCaps->machineTypes[i].name); VIR_FREE(qemuCaps->machineTypes[i].alias); + VIR_FREE(qemuCaps->machineTypes[i].defaultCPU); } VIR_FREE(qemuCaps->machineTypes); @@ -2406,7 +2409,8 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, mach = &(qemuCaps->machineTypes[qemuCaps->nmachineTypes++]); if (VIR_STRDUP(mach->alias, machines[i]->alias) < 0 || - VIR_STRDUP(mach->name, machines[i]->name) < 0) + VIR_STRDUP(mach->name, machines[i]->name) < 0 || + VIR_STRDUP(mach->defaultCPU, machines[i]->defaultCPU) < 0) goto cleanup; mach->maxCpus = machines[i]->maxCpus; @@ -3843,6 +3847,8 @@ virQEMUCapsLoadCache(virArch hostArch, if (STREQ_NULLABLE(str, "yes")) qemuCaps->machineTypes[i].qemuDefault = true; VIR_FREE(str); + + qemuCaps->machineTypes[i].defaultCPU = virXMLPropString(nodes[i], "defaultCPU"); } } VIR_FREE(nodes); @@ -4116,6 +4122,11 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps) qemuCaps->machineTypes[i].maxCpus); if (qemuCaps->machineTypes[i].qemuDefault) virBufferAddLit(&buf, " default='yes'"); + + if (qemuCaps->machineTypes[i].defaultCPU) + virBufferEscapeString(&buf, " defaultCPU='%s'", + qemuCaps->machineTypes[i].defaultCPU); + virBufferAddLit(&buf, "/>\n"); } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 6056219674..6f2d759a78 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3532,6 +3532,7 @@ qemuMonitorMachineInfoFree(qemuMonitorMachineInfoPtr machine) return; VIR_FREE(machine->name); VIR_FREE(machine->alias); + VIR_FREE(machine->defaultCPU); VIR_FREE(machine); } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index f2af1badd4..c099321ad1 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1085,6 +1085,7 @@ struct _qemuMonitorMachineInfo { char *alias; unsigned int maxCpus; bool hotplugCpus; + char *defaultCPU; }; int qemuMonitorGetMachines(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index bc30884223..1309b6a781 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5504,6 +5504,18 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, ignore_value(virJSONValueObjectGetBoolean(child, "hotpluggable-cpus", &info->hotplugCpus)); + + if (virJSONValueObjectHasKey(child, "default-cpu-type")) { + if (!(tmp = virJSONValueObjectGetString(child, "default-cpu-type"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("query-machines reply has malformed " + "'default-cpu-type' data")); + goto cleanup; + } + + if (VIR_STRDUP(info->defaultCPU, tmp) < 0) + goto cleanup; + } } ret = n; diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index a416defca0..8addadb564 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -246,76 +246,76 @@ <cpu type='tcg' name='arm946' typename='arm946-arm-cpu'/> <cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/> <cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/> - <machine name='integratorcp' maxCpus='1'/> + <machine name='integratorcp' maxCpus='1' defaultCPU='arm926-arm-cpu'/> <machine name='nuri' maxCpus='2'/> - <machine name='mps2-an511' maxCpus='1'/> - <machine name='mps2-an505' maxCpus='1'/> - <machine name='verdex' maxCpus='1'/> - <machine name='virt-3.0' maxCpus='512'/> + <machine name='mps2-an511' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> + <machine name='mps2-an505' maxCpus='1' defaultCPU='cortex-m33-arm-cpu'/> + <machine name='verdex' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/> + <machine name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> <machine name='ast2500-evb' maxCpus='2'/> <machine name='smdkc210' maxCpus='2'/> - <machine name='collie' maxCpus='1'/> + <machine name='collie' maxCpus='1' defaultCPU='sa1110-arm-cpu'/> <machine name='xlnx-versal-virt' maxCpus='2'/> <machine name='imx25-pdk' maxCpus='1'/> - <machine name='spitz' maxCpus='1'/> - <machine name='musca-b1' maxCpus='2'/> - <machine name='realview-pbx-a9' maxCpus='4'/> - <machine name='realview-eb' maxCpus='1'/> - <machine name='versatilepb' maxCpus='1'/> - <machine name='realview-pb-a8' maxCpus='1'/> - <machine name='emcraft-sf2' maxCpus='1'/> - <machine name='virt-2.9' maxCpus='255'/> - <machine name='musicpal' maxCpus='1'/> - <machine name='sbsa-ref' maxCpus='512'/> - <machine name='z2' maxCpus='1'/> - <machine name='akita' maxCpus='1'/> - <machine name='virt-2.7' maxCpus='255'/> + <machine name='spitz' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/> + <machine name='musca-b1' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/> + <machine name='realview-pbx-a9' maxCpus='4' defaultCPU='cortex-a9-arm-cpu'/> + <machine name='realview-eb' maxCpus='1' defaultCPU='arm926-arm-cpu'/> + <machine name='versatilepb' maxCpus='1' defaultCPU='arm926-arm-cpu'/> + <machine name='realview-pb-a8' maxCpus='1' defaultCPU='cortex-a8-arm-cpu'/> + <machine name='emcraft-sf2' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> + <machine name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine name='musicpal' maxCpus='1' defaultCPU='arm926-arm-cpu'/> + <machine name='sbsa-ref' maxCpus='512' defaultCPU='cortex-a57-arm-cpu'/> + <machine name='z2' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/> + <machine name='akita' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/> + <machine name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> <machine name='kzm' maxCpus='1'/> <machine name='swift-bmc' maxCpus='2'/> - <machine name='virt-2.8' maxCpus='255'/> - <machine name='realview-eb-mpcore' maxCpus='4'/> - <machine name='musca-a' maxCpus='2'/> + <machine name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine name='realview-eb-mpcore' maxCpus='4' defaultCPU='arm11mpcore-arm-cpu'/> + <machine name='musca-a' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/> <machine name='mcimx7d-sabre' maxCpus='2'/> - <machine name='sx1' maxCpus='1'/> - <machine name='virt-4.2' alias='virt' maxCpus='512'/> - <machine name='sx1-v1' maxCpus='1'/> - <machine name='virt-2.6' maxCpus='255'/> - <machine name='cubieboard' maxCpus='1'/> - <machine name='virt-4.0' maxCpus='512'/> + <machine name='sx1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/> + <machine name='virt-4.2' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> + <machine name='sx1-v1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/> + <machine name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine name='cubieboard' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/> + <machine name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> <machine name='highbank' maxCpus='4'/> - <machine name='virt-4.1' maxCpus='512'/> + <machine name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> <machine name='raspi2' maxCpus='4'/> <machine name='raspi3' maxCpus='4'/> <machine name='netduino2' maxCpus='1'/> - <machine name='terrier' maxCpus='1'/> - <machine name='n810' maxCpus='1'/> - <machine name='mainstone' maxCpus='1'/> + <machine name='terrier' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/> + <machine name='n810' maxCpus='1' defaultCPU='arm1136-r2-arm-cpu'/> + <machine name='mainstone' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/> <machine name='palmetto-bmc' maxCpus='2'/> <machine name='sabrelite' maxCpus='4'/> <machine name='midway' maxCpus='4'/> <machine name='romulus-bmc' maxCpus='2'/> - <machine name='cheetah' maxCpus='1'/> + <machine name='cheetah' maxCpus='1' defaultCPU='ti925t-arm-cpu'/> <machine name='tosa' maxCpus='1'/> - <machine name='borzoi' maxCpus='1'/> - <machine name='versatileab' maxCpus='1'/> - <machine name='lm3s6965evb' maxCpus='1'/> - <machine name='n800' maxCpus='1'/> - <machine name='virt-2.10' maxCpus='255'/> - <machine name='virt-2.11' maxCpus='255'/> + <machine name='borzoi' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/> + <machine name='versatileab' maxCpus='1' defaultCPU='arm926-arm-cpu'/> + <machine name='lm3s6965evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> + <machine name='n800' maxCpus='1' defaultCPU='arm1136-r2-arm-cpu'/> + <machine name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> + <machine name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> <machine name='connex' maxCpus='1'/> - <machine name='virt-2.12' maxCpus='255'/> + <machine name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/> <machine name='microbit' maxCpus='1'/> <machine name='witherspoon-bmc' maxCpus='2'/> - <machine name='xilinx-zynq-a9' maxCpus='1'/> - <machine name='mps2-an385' maxCpus='1'/> - <machine name='vexpress-a9' maxCpus='4'/> - <machine name='mps2-an521' maxCpus='2'/> + <machine name='xilinx-zynq-a9' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/> + <machine name='mps2-an385' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> + <machine name='vexpress-a9' maxCpus='4' defaultCPU='cortex-a9-arm-cpu'/> + <machine name='mps2-an521' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/> <machine name='mcimx6ul-evk' maxCpus='1'/> - <machine name='vexpress-a15' maxCpus='4'/> + <machine name='vexpress-a15' maxCpus='4' defaultCPU='cortex-a15-arm-cpu'/> <machine name='xlnx-zcu102' maxCpus='6'/> - <machine name='virt-3.1' maxCpus='512'/> + <machine name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/> <machine name='canon-a1100' maxCpus='1'/> - <machine name='lm3s811evb' maxCpus='1'/> + <machine name='lm3s811evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/> <gic version='3' kernel='yes' emulated='yes'/> <gic version='2' kernel='no' emulated='yes'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 3ec7686b12..b4ceb6a1e8 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -1053,35 +1053,35 @@ <cpu type='tcg' name='750_v3.1'/> <cpu type='tcg' name='power8e_v2.1'/> <cpu type='tcg' name='mpc8568e'/> - <machine name='pseries-4.2' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/> + <machine name='pseries-4.2' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='power9_v2.0-powerpc64-cpu'/> <machine name='ref405ep' maxCpus='1'/> - <machine name='sam460ex' maxCpus='1'/> - <machine name='virtex-ml507' maxCpus='1'/> - <machine name='ppce500' maxCpus='32'/> - <machine name='mpc8544ds' maxCpus='15'/> - <machine name='pseries-3.1' hotplugCpus='yes' maxCpus='1024'/> - <machine name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/> - <machine name='bamboo' maxCpus='1'/> - <machine name='g3beige' maxCpus='1'/> - <machine name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/> - <machine name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/> - <machine name='prep' maxCpus='1'/> - <machine name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/> - <machine name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/> - <machine name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/> - <machine name='mac99' maxCpus='1'/> - <machine name='pseries-2.6' maxCpus='1024'/> - <machine name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/> - <machine name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/> - <machine name='pseries-2.4' maxCpus='1024'/> - <machine name='pseries-2.5' maxCpus='1024'/> - <machine name='pseries-4.0' hotplugCpus='yes' maxCpus='1024'/> - <machine name='pseries-4.1' hotplugCpus='yes' maxCpus='1024'/> - <machine name='pseries-2.2' maxCpus='1024'/> + <machine name='sam460ex' maxCpus='1' defaultCPU='460exb-powerpc64-cpu'/> + <machine name='virtex-ml507' maxCpus='1' defaultCPU='440-xilinx-powerpc64-cpu'/> + <machine name='ppce500' maxCpus='32' defaultCPU='e500v2_v30-powerpc64-cpu'/> + <machine name='mpc8544ds' maxCpus='15' defaultCPU='e500v2_v30-powerpc64-cpu'/> + <machine name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> + <machine name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> + <machine name='bamboo' maxCpus='1' defaultCPU='440epb-powerpc64-cpu'/> + <machine name='g3beige' maxCpus='1' defaultCPU='750_v3.1-powerpc64-cpu'/> + <machine name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> + <machine name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> + <machine name='prep' maxCpus='1' defaultCPU='602-powerpc64-cpu'/> + <machine name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> + <machine name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> + <machine name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> + <machine name='mac99' maxCpus='1' defaultCPU='970fx_v3.1-powerpc64-cpu'/> + <machine name='pseries-2.6' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> + <machine name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> + <machine name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/> + <machine name='pseries-2.4' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> + <machine name='pseries-2.5' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> + <machine name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu'/> + <machine name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu'/> + <machine name='pseries-2.2' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> <machine name='taihu' maxCpus='1'/> - <machine name='pseries-2.3' maxCpus='1024'/> - <machine name='pseries-2.1' maxCpus='1024'/> - <machine name='powernv8' maxCpus='2048'/> - <machine name='powernv9' alias='powernv' maxCpus='2048'/> - <machine name='40p' maxCpus='1'/> + <machine name='pseries-2.3' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> + <machine name='pseries-2.1' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/> + <machine name='powernv8' maxCpus='2048' defaultCPU='power8_v2.0-powerpc64-cpu'/> + <machine name='powernv9' alias='powernv' maxCpus='2048' defaultCPU='power9_v2.0-powerpc64-cpu'/> + <machine name='40p' maxCpus='1' defaultCPU='604-powerpc64-cpu'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 14783c8d1d..3d2ba7983b 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -3328,18 +3328,18 @@ <blocker name='type'/> </cpu> <cpu type='tcg' name='qemu' typename='qemu-s390x-cpu' usable='yes'/> - <machine name='s390-ccw-virtio-4.2' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/> - <machine name='s390-ccw-virtio-4.0' hotplugCpus='yes' maxCpus='248'/> - <machine name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248'/> - <machine name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/> - <machine name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/> - <machine name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/> - <machine name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248'/> - <machine name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/> - <machine name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/> - <machine name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/> - <machine name='s390-ccw-virtio-4.1' hotplugCpus='yes' maxCpus='248'/> - <machine name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/> - <machine name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/> - <machine name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/> + <machine name='s390-ccw-virtio-4.2' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' defaultCPU='qemu-s390x-cpu'/> + <machine name='s390-ccw-virtio-4.0' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine name='s390-ccw-virtio-4.1' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 176613fa2a..e87bb84a9e 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -1904,50 +1904,50 @@ </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 name='pc-i440fx-4.2' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-4.2' alias='q35' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> - <machine name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> + <machine name='pc-i440fx-4.2' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-0.15' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-q35-4.2' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-0.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-0.14' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu'/> + <machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-0.13' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/> + <machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/> </qemuCaps> -- 2.23.0