The default number of CPU clusters is 1, and values other than that one are currently rejected by all hypervisor drivers. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; Reviewed-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/bhyve/bhyve_command.c | 5 +++++ src/conf/cpu_conf.c | 16 +++++++++++++++- src/conf/cpu_conf.h | 1 + src/conf/domain_conf.c | 1 + src/conf/schemas/cputypes.rng | 5 +++++ src/cpu/cpu.c | 1 + src/libxl/libxl_capabilities.c | 1 + src/qemu/qemu_command.c | 5 +++++ src/vmx/vmx.c | 7 +++++++ .../x86_64-host+guest,model486-result.xml | 2 +- .../x86_64-host+guest,models-result.xml | 2 +- tests/cputestdata/x86_64-host+guest-result.xml | 2 +- tests/cputestdata/x86_64-host+guest.xml | 2 +- .../x86_64-host+host-model-nofallback.xml | 2 +- ...host-Haswell-noTSX+Haswell,haswell-result.xml | 2 +- ...aswell-noTSX+Haswell-noTSX,haswell-result.xml | 2 +- ...4-host-Haswell-noTSX+Haswell-noTSX-result.xml | 2 +- .../x86_64-host-worse+guest-result.xml | 2 +- .../ppc64-modern-bulk-result-conf.xml | 2 +- .../ppc64-modern-bulk-result-live.xml | 2 +- .../ppc64-modern-individual-result-conf.xml | 2 +- .../ppc64-modern-individual-result-live.xml | 2 +- .../x86-modern-bulk-result-conf.xml | 2 +- .../x86-modern-bulk-result-live.xml | 2 +- .../x86-modern-individual-add-result-conf.xml | 2 +- .../x86-modern-individual-add-result-live.xml | 2 +- ...e-timeout+graphics-spice-timeout-password.xml | 2 +- .../qemuhotplug-graphics-spice-timeout.xml | 2 +- .../fd-memory-no-numa-topology.xml | 2 +- .../qemuxml2argvdata/fd-memory-numa-topology.xml | 2 +- .../fd-memory-numa-topology2.xml | 2 +- .../fd-memory-numa-topology3.xml | 2 +- tests/qemuxml2argvdata/hugepages-nvdimm.xml | 2 +- .../memfd-memory-default-hugepage.xml | 2 +- tests/qemuxml2argvdata/memfd-memory-numa.xml | 2 +- .../memory-hotplug-nvdimm-access.xml | 2 +- .../memory-hotplug-nvdimm-align.xml | 2 +- .../memory-hotplug-nvdimm-label.xml | 2 +- .../memory-hotplug-nvdimm-pmem.xml | 2 +- .../memory-hotplug-nvdimm-readonly.xml | 2 +- tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml | 2 +- .../memory-hotplug-virtio-mem.xml | 2 +- .../memory-hotplug-virtio-pmem.xml | 2 +- .../cpu-numa-disjoint.x86_64-latest.xml | 2 +- .../cpu-numa-disordered.x86_64-latest.xml | 2 +- .../cpu-numa-memshared.x86_64-latest.xml | 2 +- .../cpu-numa-no-memory-element.x86_64-latest.xml | 2 +- .../cpu-numa1.x86_64-latest.xml | 2 +- .../cpu-numa2.x86_64-latest.xml | 2 +- .../memory-hotplug-dimm-addr.x86_64-latest.xml | 2 +- .../memory-hotplug-dimm.x86_64-latest.xml | 2 +- .../memory-hotplug-multiple.x86_64-latest.xml | 2 +- ...plug-nvdimm-ppc64-abi-update.ppc64-latest.xml | 2 +- .../memory-hotplug-nvdimm-ppc64.ppc64-latest.xml | 2 +- .../memory-hotplug.x86_64-latest.xml | 2 +- ...mad-auto-memory-vcpu-cpuset.x86_64-latest.xml | 2 +- ...cpu-no-cpuset-and-placement.x86_64-latest.xml | 2 +- ...numad-auto-vcpu-no-numatune.x86_64-latest.xml | 2 +- ...mad-static-vcpu-no-numatune.x86_64-latest.xml | 2 +- .../pci-expander-bus.x86_64-latest.xml | 2 +- .../pcie-expander-bus.x86_64-latest.xml | 2 +- .../pseries-phb-numa-node.ppc64-latest.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-10.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-8.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-9.xml | 2 +- 65 files changed, 97 insertions(+), 57 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 5b388c7a8f..d05b01ae5d 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -672,6 +672,11 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, _("Only 1 die per socket is supported")); return NULL; } + if (def->cpu->clusters != 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only 1 cluster per die is supported")); + return NULL; + } if (nvcpus != def->cpu->sockets * def->cpu->cores * def->cpu->threads) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Invalid CPU topology: total number of vCPUs must equal the product of sockets, cores, and threads")); diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 7abe489733..6e6e1b9a89 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -241,6 +241,7 @@ virCPUDefCopyWithoutModel(const virCPUDef *cpu) copy->fallback = cpu->fallback; copy->sockets = cpu->sockets; copy->dies = cpu->dies; + copy->clusters = cpu->clusters; copy->cores = cpu->cores; copy->threads = cpu->threads; copy->arch = cpu->arch; @@ -572,6 +573,12 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, return -1; } + if (virXMLPropUIntDefault(topology, "clusters", 10, + VIR_XML_PROP_NONZERO, + &def->clusters, 1) < 0) { + return -1; + } + if (virXMLPropUInt(topology, "cores", 10, VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO, &def->cores) < 0) { @@ -827,10 +834,11 @@ virCPUDefFormatBuf(virBuffer *buf, virBufferAddLit(buf, "/>\n"); } - if (def->sockets && def->dies && def->cores && def->threads) { + if (def->sockets && def->dies && def->clusters && def->cores && def->threads) { virBufferAddLit(buf, "<topology"); virBufferAsprintf(buf, " sockets='%u'", def->sockets); virBufferAsprintf(buf, " dies='%u'", def->dies); + virBufferAsprintf(buf, " clusters='%u'", def->clusters); virBufferAsprintf(buf, " cores='%u'", def->cores); virBufferAsprintf(buf, " threads='%u'", def->threads); virBufferAddLit(buf, "/>\n"); @@ -1106,6 +1114,12 @@ virCPUDefIsEqual(virCPUDef *src, return false; } + if (src->clusters != dst->clusters) { + MISMATCH(_("Target CPU clusters %1$d does not match source %2$d"), + dst->clusters, src->clusters); + return false; + } + if (src->cores != dst->cores) { MISMATCH(_("Target CPU cores %1$d does not match source %2$d"), dst->cores, src->cores); diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index 3e4c53675c..2694022fed 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -148,6 +148,7 @@ struct _virCPUDef { unsigned int microcodeVersion; unsigned int sockets; unsigned int dies; + unsigned int clusters; unsigned int cores; unsigned int threads; unsigned int sigFamily; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index be57a1981e..f9d643fc12 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2316,6 +2316,7 @@ virDomainDefGetVcpusTopology(const virDomainDef *def, /* multiplication of 32bit numbers fits into a 64bit variable */ if ((tmp *= def->cpu->dies) > UINT_MAX || + (tmp *= def->cpu->clusters) > UINT_MAX || (tmp *= def->cpu->cores) > UINT_MAX || (tmp *= def->cpu->threads) > UINT_MAX) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/src/conf/schemas/cputypes.rng b/src/conf/schemas/cputypes.rng index db1aa57158..3a8910e09f 100644 --- a/src/conf/schemas/cputypes.rng +++ b/src/conf/schemas/cputypes.rng @@ -92,6 +92,11 @@ <ref name="positiveInteger"/> </attribute> </optional> + <optional> + <attribute name="clusters"> + <ref name="positiveInteger"/> + </attribute> + </optional> <attribute name="cores"> <ref name="positiveInteger"/> </attribute> diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index bc43aa4e93..4f048d0dad 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -435,6 +435,7 @@ virCPUGetHost(virArch arch, if (nodeInfo) { cpu->sockets = nodeInfo->sockets; cpu->dies = 1; + cpu->clusters = 1; cpu->cores = nodeInfo->cores; cpu->threads = nodeInfo->threads; } diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index dfb602ca2f..522256777d 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -152,6 +152,7 @@ libxlCapsInitCPU(virCaps *caps, libxl_physinfo *phy_info) cpu->cores = phy_info->cores_per_socket; cpu->threads = phy_info->threads_per_core; cpu->dies = 1; + cpu->clusters = 1; cpu->sockets = phy_info->nr_cpus / (cpu->cores * cpu->threads); if (!(data = libxlCapsNodeData(cpu, phy_info->hw_cap)) || diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 653817173b..71daa85e55 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7226,6 +7226,11 @@ qemuBuildSmpCommandLine(virCommand *cmd, _("Only 1 die per socket is supported")); return -1; } + if (def->cpu->clusters != 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only 1 cluster per die is supported")); + return -1; + } virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_DIES)) virBufferAsprintf(&buf, ",dies=%u", def->cpu->dies); diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 26b89776e1..4ac2320251 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1583,6 +1583,7 @@ virVMXParseConfig(virVMXContext *ctx, goto cleanup; } cpu->dies = 1; + cpu->clusters = 1; cpu->cores = coresPerSocket; cpu->threads = 1; @@ -3377,6 +3378,12 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOption *xmlopt, virDomainDef goto cleanup; } + if (def->cpu->clusters != 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only 1 cluster per die is supported")); + goto cleanup; + } + calculated_vcpus = def->cpu->sockets * def->cpu->cores; if (calculated_vcpus != maxvcpus) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/tests/cputestdata/x86_64-host+guest,model486-result.xml b/tests/cputestdata/x86_64-host+guest,model486-result.xml index ea8e2d3a48..b533f22b88 100644 --- a/tests/cputestdata/x86_64-host+guest,model486-result.xml +++ b/tests/cputestdata/x86_64-host+guest,model486-result.xml @@ -1,6 +1,6 @@ <cpu mode='custom' match='exact'> <model fallback='allow'>486</model> - <topology sockets='2' dies='1' cores='4' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='4' threads='1'/> <feature policy='require' name='de'/> <feature policy='require' name='tsc'/> <feature policy='require' name='msr'/> diff --git a/tests/cputestdata/x86_64-host+guest,models-result.xml b/tests/cputestdata/x86_64-host+guest,models-result.xml index 42664a48b4..e975d9bc18 100644 --- a/tests/cputestdata/x86_64-host+guest,models-result.xml +++ b/tests/cputestdata/x86_64-host+guest,models-result.xml @@ -1,6 +1,6 @@ <cpu mode='custom' match='exact'> <model fallback='allow'>qemu64</model> - <topology sockets='2' dies='1' cores='4' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='4' threads='1'/> <feature policy='force' name='pbe'/> <feature policy='force' name='monitor'/> <feature policy='require' name='ssse3'/> diff --git a/tests/cputestdata/x86_64-host+guest-result.xml b/tests/cputestdata/x86_64-host+guest-result.xml index 28e3152cbf..cf41b3f872 100644 --- a/tests/cputestdata/x86_64-host+guest-result.xml +++ b/tests/cputestdata/x86_64-host+guest-result.xml @@ -1,6 +1,6 @@ <cpu mode='custom' match='exact'> <model fallback='allow'>Penryn</model> - <topology sockets='2' dies='1' cores='4' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='4' threads='1'/> <feature policy='require' name='dca'/> <feature policy='require' name='xtpr'/> <feature policy='disable' name='sse4.2'/> diff --git a/tests/cputestdata/x86_64-host+guest.xml b/tests/cputestdata/x86_64-host+guest.xml index 28e3152cbf..cf41b3f872 100644 --- a/tests/cputestdata/x86_64-host+guest.xml +++ b/tests/cputestdata/x86_64-host+guest.xml @@ -1,6 +1,6 @@ <cpu mode='custom' match='exact'> <model fallback='allow'>Penryn</model> - <topology sockets='2' dies='1' cores='4' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='4' threads='1'/> <feature policy='require' name='dca'/> <feature policy='require' name='xtpr'/> <feature policy='disable' name='sse4.2'/> diff --git a/tests/cputestdata/x86_64-host+host-model-nofallback.xml b/tests/cputestdata/x86_64-host+host-model-nofallback.xml index 16d6e1daf2..881eea7bd0 100644 --- a/tests/cputestdata/x86_64-host+host-model-nofallback.xml +++ b/tests/cputestdata/x86_64-host+host-model-nofallback.xml @@ -1,7 +1,7 @@ <cpu mode='custom' match='exact'> <model fallback='forbid'>Penryn</model> <vendor>Intel</vendor> - <topology sockets='1' dies='1' cores='2' threads='1'/> + <topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/> <feature policy='require' name='dca'/> <feature policy='require' name='xtpr'/> <feature policy='require' name='tm2'/> diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml index 8eda6684a0..67994c62cc 100644 --- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml +++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml @@ -1,6 +1,6 @@ <cpu mode='custom' match='exact'> <model fallback='allow'>Haswell</model> - <topology sockets='1' dies='1' cores='2' threads='2'/> + <topology sockets='1' dies='1' clusters='1' cores='2' threads='2'/> <feature policy='disable' name='rtm'/> <feature policy='disable' name='hle'/> </cpu> diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml index cb02449d60..4804c0b818 100644 --- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml +++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml @@ -1,6 +1,6 @@ <cpu mode='custom' match='exact'> <model fallback='allow'>Haswell</model> - <topology sockets='1' dies='1' cores='2' threads='2'/> + <topology sockets='1' dies='1' clusters='1' cores='2' threads='2'/> <feature policy='disable' name='hle'/> <feature policy='disable' name='rtm'/> </cpu> diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml index 7ee926aba8..c21b331248 100644 --- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml +++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml @@ -1,4 +1,4 @@ <cpu mode='custom' match='exact'> <model fallback='allow'>Haswell-noTSX</model> - <topology sockets='1' dies='1' cores='2' threads='2'/> + <topology sockets='1' dies='1' clusters='1' cores='2' threads='2'/> </cpu> diff --git a/tests/cputestdata/x86_64-host-worse+guest-result.xml b/tests/cputestdata/x86_64-host-worse+guest-result.xml index 9d54c66a8f..712c3ad341 100644 --- a/tests/cputestdata/x86_64-host-worse+guest-result.xml +++ b/tests/cputestdata/x86_64-host-worse+guest-result.xml @@ -1,6 +1,6 @@ <cpu mode='custom' match='exact'> <model fallback='allow'>Penryn</model> - <topology sockets='2' dies='1' cores='4' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='4' threads='1'/> <feature policy='disable' name='dca'/> <feature policy='disable' name='xtpr'/> <feature policy='disable' name='sse4.2'/> diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml index ad11b2f8a6..1a0d28257e 100644 --- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml +++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml @@ -44,7 +44,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>POWER9</model> - <topology sockets='1' dies='1' cores='4' threads='8'/> + <topology sockets='1' dies='1' clusters='1' cores='4' threads='8'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml index 2a3b4a495f..b127883b36 100644 --- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml +++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml @@ -44,7 +44,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>POWER9</model> - <topology sockets='1' dies='1' cores='4' threads='8'/> + <topology sockets='1' dies='1' clusters='1' cores='4' threads='8'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml index 34aec9b965..29f1a5ac45 100644 --- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml +++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml @@ -44,7 +44,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>POWER9</model> - <topology sockets='1' dies='1' cores='4' threads='8'/> + <topology sockets='1' dies='1' clusters='1' cores='4' threads='8'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml index 5ce2cfd0b0..76a85ac9f0 100644 --- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml +++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml @@ -44,7 +44,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>POWER9</model> - <topology sockets='1' dies='1' cores='4' threads='8'/> + <topology sockets='1' dies='1' clusters='1' cores='4' threads='8'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml index 8d52ffedb4..bec46987ff 100644 --- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml +++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml @@ -20,7 +20,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='4' dies='1' cores='2' threads='1'/> + <topology sockets='4' dies='1' clusters='1' cores='2' threads='1'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml index f416397e33..be9769c686 100644 --- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml +++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml @@ -20,7 +20,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='4' dies='1' cores='2' threads='1'/> + <topology sockets='4' dies='1' clusters='1' cores='2' threads='1'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml index 0bd2af8e43..539f607818 100644 --- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml +++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml @@ -20,7 +20,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='4' dies='1' cores='2' threads='1'/> + <topology sockets='4' dies='1' clusters='1' cores='2' threads='1'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml index b31e6ebe55..acbdd3cfd5 100644 --- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml +++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml @@ -20,7 +20,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='4' dies='1' cores='2' threads='1'/> + <topology sockets='4' dies='1' clusters='1' cores='2' threads='1'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout+graphics-spice-timeout-password.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout+graphics-spice-timeout-password.xml index 03964ad01c..ee53339338 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout+graphics-spice-timeout-password.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout+graphics-spice-timeout-password.xml @@ -18,7 +18,7 @@ <cpu mode='custom' match='exact' check='partial'> <model fallback='allow'>core2duo</model> <vendor>Intel</vendor> - <topology sockets='1' dies='1' cores='2' threads='1'/> + <topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/> <feature policy='require' name='lahf_lm'/> <feature policy='require' name='xtpr'/> <feature policy='require' name='cx16'/> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml index e6b0cc833a..eb9b902fc5 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml @@ -18,7 +18,7 @@ <cpu mode='custom' match='exact' check='partial'> <model fallback='allow'>core2duo</model> <vendor>Intel</vendor> - <topology sockets='1' dies='1' cores='2' threads='1'/> + <topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/> <feature policy='require' name='lahf_lm'/> <feature policy='require' name='xtpr'/> <feature policy='require' name='cx16'/> diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml index 2090bb8288..92f418fb88 100644 --- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml +++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml @@ -15,7 +15,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='8' dies='1' cores='1' threads='1'/> + <topology sockets='8' dies='1' clusters='1' cores='1' threads='1'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml index 2f94690656..543509d832 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml @@ -15,7 +15,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='1' dies='1' cores='8' threads='1'/> + <topology sockets='1' dies='1' clusters='1' cores='8' threads='1'/> <numa> <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/> </numa> diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml index 3a4e9b478e..d3b98da3c6 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml @@ -15,7 +15,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='1' dies='1' cores='20' threads='1'/> + <topology sockets='1' dies='1' clusters='1' cores='20' threads='1'/> <numa> <cell id='0' cpus='0-7,16-19' memory='14680064' unit='KiB'/> <cell id='1' cpus='8-15' memory='14680064' unit='KiB' memAccess='shared'/> diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml index 0f7f74283b..459d1b9d1d 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml @@ -15,7 +15,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='1' dies='1' cores='32' threads='1'/> + <topology sockets='1' dies='1' clusters='1' cores='32' threads='1'/> <numa> <cell id='0' cpus='0-1,6-31' memory='14680064' unit='KiB'/> <cell id='1' cpus='2-3' memory='14680064' unit='KiB' memAccess='shared'/> diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.xml b/tests/qemuxml2argvdata/hugepages-nvdimm.xml index 1a1500895b..b786b0d3dd 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.xml +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.xml @@ -17,7 +17,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> <numa> <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/> </numa> diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml index 238d4c6b52..a70bd53134 100644 --- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml +++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml @@ -19,7 +19,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='1' dies='1' cores='8' threads='1'/> + <topology sockets='1' dies='1' clusters='1' cores='8' threads='1'/> <numa> <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/> </numa> diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.xml b/tests/qemuxml2argvdata/memfd-memory-numa.xml index 1ac87e3aef..0c5d7ba4ef 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.xml +++ b/tests/qemuxml2argvdata/memfd-memory-numa.xml @@ -22,7 +22,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='1' dies='1' cores='8' threads='1'/> + <topology sockets='1' dies='1' clusters='1' cores='8' threads='1'/> <numa> <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/> </numa> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml index bee0346aca..84baf82bf5 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml @@ -15,7 +15,7 @@ </idmap> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> <numa> <cell id='0' cpus='0-1' memory='219136' unit='KiB'/> </numa> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml index decf87db63..664418e805 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml @@ -15,7 +15,7 @@ </idmap> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> <numa> <cell id='0' cpus='0-1' memory='219136' unit='KiB'/> </numa> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml index 8a0dab3908..f998f7f276 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml @@ -15,7 +15,7 @@ </idmap> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> <numa> <cell id='0' cpus='0-1' memory='219136' unit='KiB'/> </numa> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml index a712adfe1e..d66481fd35 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml @@ -15,7 +15,7 @@ </idmap> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> <numa> <cell id='0' cpus='0-1' memory='219136' unit='KiB'/> </numa> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml index 57629ccb8c..56d6b7b712 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml @@ -15,7 +15,7 @@ </idmap> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> <numa> <cell id='0' cpus='0-1' memory='219136' unit='KiB'/> </numa> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml index 865ddcf0ea..ff6e3b7b0f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml @@ -15,7 +15,7 @@ </idmap> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> <numa> <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/> </numa> diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml index c578209d8a..52fa6b14e9 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml @@ -11,7 +11,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> <numa> <cell id='0' cpus='0-1' memory='2095104' unit='KiB'/> </numa> diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml index a8b22dd3c5..2786a739ad 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml @@ -11,7 +11,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> <numa> <cell id='0' cpus='0-1' memory='2095104' unit='KiB'/> </numa> diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml index fa2ec31463..4f33094949 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml @@ -10,7 +10,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='4' threads='2'/> + <topology sockets='2' dies='1' clusters='1' cores='4' threads='2'/> <numa> <cell id='0' cpus='0-3,8-11' memory='109550' unit='KiB'/> <cell id='1' cpus='4-7,12-15' memory='109550' unit='KiB'/> diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml index 1b4d0bfa67..75dcb8c9e2 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml @@ -10,7 +10,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='4' threads='2'/> + <topology sockets='2' dies='1' clusters='1' cores='4' threads='2'/> <numa> <cell id='0' cpus='0-5' memory='109550' unit='KiB'/> <cell id='1' cpus='11-15' memory='109550' unit='KiB'/> diff --git a/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml index 47ed9efd69..c45e295921 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml @@ -10,7 +10,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='4' threads='2'/> + <topology sockets='2' dies='1' clusters='1' cores='4' threads='2'/> <numa> <cell id='0' cpus='0-7' memory='109550' unit='KiB' memAccess='shared'/> <cell id='1' cpus='8-15' memory='109550' unit='KiB' memAccess='private'/> diff --git a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml index 57bbacdff0..663d137ff5 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml @@ -10,7 +10,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='4' threads='2'/> + <topology sockets='2' dies='1' clusters='1' cores='4' threads='2'/> <numa> <cell id='0' cpus='0-7' memory='109550' unit='KiB'/> <cell id='1' cpus='8-15' memory='109550' unit='KiB'/> diff --git a/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml index 57bbacdff0..663d137ff5 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml @@ -10,7 +10,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='4' threads='2'/> + <topology sockets='2' dies='1' clusters='1' cores='4' threads='2'/> <numa> <cell id='0' cpus='0-7' memory='109550' unit='KiB'/> <cell id='1' cpus='8-15' memory='109550' unit='KiB'/> diff --git a/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml index 57bbacdff0..663d137ff5 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml @@ -10,7 +10,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='4' threads='2'/> + <topology sockets='2' dies='1' clusters='1' cores='4' threads='2'/> <numa> <cell id='0' cpus='0-7' memory='109550' unit='KiB'/> <cell id='1' cpus='8-15' memory='109550' unit='KiB'/> diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml index 0a32d5491a..38b41e6719 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml @@ -11,7 +11,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> <numa> <cell id='0' cpus='0-1' memory='219136' unit='KiB'/> </numa> diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml index 7c1b7b2c5d..7f0dc85c0e 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml @@ -15,7 +15,7 @@ </idmap> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> <numa> <cell id='0' cpus='0-1' memory='219136' unit='KiB'/> </numa> diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml index 42b0f7b880..b3306fb569 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml @@ -11,7 +11,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> <numa> <cell id='0' cpus='0-1' memory='2095104' unit='KiB'/> </numa> diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml index ae157c4849..4cc0c674df 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml @@ -11,7 +11,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>POWER9</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> <numa> <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/> </numa> diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml index 3c1cbc731d..a5c26e3c5b 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml @@ -11,7 +11,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>POWER9</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> <numa> <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/> </numa> diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml index 083102e8d6..697819387f 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml @@ -11,7 +11,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> <numa> <cell id='0' cpus='0-1' memory='219136' unit='KiB'/> </numa> diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml index 2d04bc23c2..6068a76464 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml @@ -13,7 +13,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml index 80f7284126..6c558526e9 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml @@ -13,7 +13,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml index 724209f6e3..6e1fecb488 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml @@ -13,7 +13,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml index 2a4ee0d496..c42d7066f9 100644 --- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml @@ -10,7 +10,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='1' threads='1'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml index b63c8c145a..2a6c329a40 100644 --- a/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml @@ -10,7 +10,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='4' threads='2'/> + <topology sockets='2' dies='1' clusters='1' cores='4' threads='2'/> <numa> <cell id='0' cpus='0-7' memory='109550' unit='KiB'/> <cell id='1' cpus='8-15' memory='109550' unit='KiB'/> diff --git a/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml index a441be8ebe..99612740b2 100644 --- a/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml @@ -10,7 +10,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>qemu64</model> - <topology sockets='2' dies='1' cores='4' threads='2'/> + <topology sockets='2' dies='1' clusters='1' cores='4' threads='2'/> <numa> <cell id='0' cpus='0-7' memory='109550' unit='KiB'/> <cell id='1' cpus='8-15' memory='109550' unit='KiB'/> diff --git a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml index 59015846fb..0a044f50b0 100644 --- a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml +++ b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml @@ -14,7 +14,7 @@ </os> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>POWER9</model> - <topology sockets='2' dies='1' cores='1' threads='4'/> + <topology sockets='2' dies='1' clusters='1' cores='1' threads='4'/> <numa> <cell id='0' cpus='0-3' memory='1048576' unit='KiB'/> <cell id='1' cpus='4-7' memory='1048576' unit='KiB'/> diff --git a/tests/vmx2xmldata/esx-in-the-wild-10.xml b/tests/vmx2xmldata/esx-in-the-wild-10.xml index 47ed637920..78129682bd 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-10.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-10.xml @@ -12,7 +12,7 @@ <type arch='x86_64'>hvm</type> </os> <cpu> - <topology sockets='1' dies='1' cores='2' threads='1'/> + <topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/vmx2xmldata/esx-in-the-wild-8.xml b/tests/vmx2xmldata/esx-in-the-wild-8.xml index 0eea610709..47d22ced2a 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-8.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-8.xml @@ -11,7 +11,7 @@ <type arch='x86_64'>hvm</type> </os> <cpu> - <topology sockets='4' dies='1' cores='2' threads='1'/> + <topology sockets='4' dies='1' clusters='1' cores='2' threads='1'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/vmx2xmldata/esx-in-the-wild-9.xml b/tests/vmx2xmldata/esx-in-the-wild-9.xml index 66eca400dd..ee6be2527f 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-9.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-9.xml @@ -12,7 +12,7 @@ <type arch='x86_64'>hvm</type> </os> <cpu> - <topology sockets='4' dies='1' cores='4' threads='1'/> + <topology sockets='4' dies='1' clusters='1' cores='4' threads='1'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> -- 2.43.0

https://issues.redhat.com/browse/RHEL-7043 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; Reviewed-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_command.c | 5 ++++- .../qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args | 2 +- .../qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args | 2 +- .../cpu-numa-no-memory-element.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args | 2 +- .../fd-memory-no-numa-topology.x86_64-latest.args | 2 +- .../fd-memory-numa-topology.x86_64-latest.args | 2 +- .../fd-memory-numa-topology2.x86_64-latest.args | 2 +- .../fd-memory-numa-topology3.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args | 2 +- .../memfd-memory-default-hugepage.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args | 2 +- .../memory-hotplug-dimm-addr.x86_64-latest.args | 2 +- .../qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args | 2 +- .../memory-hotplug-multiple.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-access.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-align.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-label.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args | 2 +- .../memory-hotplug-nvdimm-ppc64.ppc64-latest.args | 2 +- .../memory-hotplug-nvdimm-readonly.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 2 +- .../memory-hotplug-virtio-mem.x86_64-latest.args | 2 +- .../memory-hotplug-virtio-pmem.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args | 2 +- .../numad-auto-memory-vcpu-cpuset.x86_64-latest.args | 2 +- ...to-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args | 2 +- .../numad-auto-vcpu-no-numatune.x86_64-latest.args | 2 +- .../numad-auto-vcpu-static-numatune.x86_64-latest.args | 2 +- .../numad-static-memory-auto-vcpu.x86_64-latest.args | 2 +- .../numad-static-vcpu-no-numatune.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/numad.x86_64-latest.args | 2 +- .../numatune-auto-nodeset-invalid.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args | 2 +- .../qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args | 2 +- 44 files changed, 47 insertions(+), 44 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 71daa85e55..712feb7b81 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7226,7 +7226,8 @@ qemuBuildSmpCommandLine(virCommand *cmd, _("Only 1 die per socket is supported")); return -1; } - if (def->cpu->clusters != 1) { + if (def->cpu->clusters != 1 && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_CLUSTERS)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Only 1 cluster per die is supported")); return -1; @@ -7234,6 +7235,8 @@ qemuBuildSmpCommandLine(virCommand *cmd, virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_DIES)) virBufferAsprintf(&buf, ",dies=%u", def->cpu->dies); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_CLUSTERS)) + virBufferAsprintf(&buf, ",clusters=%u", def->cpu->clusters); virBufferAsprintf(&buf, ",cores=%u", def->cpu->cores); virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads); } else { diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args index 009c08d71a..af1b464104 100644 --- a/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 1,maxcpus=6,sockets=3,dies=1,cores=2,threads=1 \ +-smp 1,maxcpus=6,sockets=3,dies=1,clusters=1,cores=2,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args index 3b12934425..22fca082a8 100644 --- a/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,dies=1,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-3,cpus=8-11,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args index ee6974326d..bc4a6ad5f3 100644 --- a/tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=328704k \ -overcommit mem-lock=off \ --smp 16,sockets=2,dies=1,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-5,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args index 0c9ec88b8b..1e486b1bbc 100644 --- a/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,dies=1,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0","share":true,"size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node1","share":false,"size":112197632}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args index 31a61f023e..59372c4ab9 100644 --- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,dies=1,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args index 31a61f023e..59372c4ab9 100644 --- a/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,dies=1,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args index 31a61f023e..59372c4ab9 100644 --- a/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,dies=1,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args index 009c08d71a..af1b464104 100644 --- a/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 1,maxcpus=6,sockets=3,dies=1,cores=2,threads=1 \ +-smp 1,maxcpus=6,sockets=3,dies=1,clusters=1,cores=2,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args index 7ba175fa80..8560eb6126 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 6,sockets=1,dies=1,cores=2,threads=3 \ +-smp 6,sockets=1,dies=1,clusters=1,cores=2,threads=3 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args index c11b4cd307..3878c558b8 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 6,sockets=3,dies=1,cores=2,threads=1 \ +-smp 6,sockets=3,dies=1,clusters=1,cores=2,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args index d0e31ba2b5..8720038c0d 100644 --- a/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 1,maxcpus=6,sockets=1,dies=3,cores=2,threads=1 \ +-smp 1,maxcpus=6,sockets=1,dies=3,clusters=1,cores=2,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args index 58b3c7b544..1bd75a85a6 100644 --- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ -m size=14680064k \ -object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/pc.ram","share":true,"x-use-canonical-path-for-ramblock-id":false,"prealloc":true,"size":15032385536}' \ -overcommit mem-lock=off \ --smp 8,sockets=8,dies=1,cores=1,threads=1 \ +-smp 8,sockets=8,dies=1,clusters=1,cores=1,threads=1 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args b/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args index 21f9a16540..17ef506431 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ -cpu qemu64 \ -m size=14680064k \ -overcommit mem-lock=off \ --smp 8,sockets=1,dies=1,cores=8,threads=1 \ +-smp 8,sockets=1,dies=1,clusters=1,cores=8,threads=1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":true,"prealloc":true,"size":15032385536}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args b/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args index 3bf16f9caf..b247231b85 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ -cpu qemu64 \ -m size=29360128k \ -overcommit mem-lock=off \ --smp 20,sockets=1,dies=1,cores=20,threads=1 \ +-smp 20,sockets=1,dies=1,clusters=1,cores=20,threads=1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":false,"prealloc":true,"size":15032385536}' \ -numa node,nodeid=0,cpus=0-7,cpus=16-19,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1","share":true,"prealloc":true,"size":15032385536}' \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args b/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args index 3153e22d56..9e94209499 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ -cpu qemu64 \ -m size=44040192k \ -overcommit mem-lock=off \ --smp 32,sockets=1,dies=1,cores=32,threads=1 \ +-smp 32,sockets=1,dies=1,clusters=1,cores=32,threads=1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":true,"prealloc":true,"size":15032385536}' \ -numa node,nodeid=0,cpus=0-1,cpus=6-31,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1","share":true,"prealloc":true,"size":15032385536}' \ diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args index fa376accb5..f30db0ad09 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"size":1073741824}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args index 55969eb2fd..f850d7be60 100644 --- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ -cpu qemu64 \ -m size=14680064k \ -overcommit mem-lock=off \ --smp 8,sockets=1,dies=1,cores=8,threads=1 \ +-smp 8,sockets=1,dies=1,clusters=1,cores=8,threads=1 \ -object '{"qom-type":"thread-context","id":"tc-ram-node0","node-affinity":[3]}' \ -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":true,"hugetlbsize":2097152,"share":true,"prealloc":true,"size":15032385536,"host-nodes":[3],"policy":"preferred","prealloc-context":"tc-ram-node0"}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args index 1ef2d69fcb..dbe2b82a56 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ -cpu qemu64 \ -m size=14680064k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 8,sockets=1,dies=1,cores=8,threads=1 \ +-smp 8,sockets=1,dies=1,clusters=1,cores=8,threads=1 \ -object '{"qom-type":"thread-context","id":"tc-ram-node0","node-affinity":[3]}' \ -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":true,"hugetlbsize":2097152,"share":true,"prealloc":true,"prealloc-threads":8,"size":15032385536,"host-nodes":[3],"policy":"preferred","prealloc-context":"tc-ram-node0"}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args index 6ae1fd1b98..c15fe191de 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args index 71817da309..a729930db2 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args index ad1dad01ac..f1f2f93a11 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=2095104k,slots=2,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args index f09ae22927..d53732b39e 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args index 6cfe4b8263..cba467d9d3 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args index 4041c15b2b..2ad23a0224 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args index 3547e96c00..ac5ca187b1 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args index 9b57518fca..c2c1623d9f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu POWER9 \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args index 9b57518fca..c2c1623d9f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu POWER9 \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args index 17bacfb2f6..8af4673841 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args index 1321e5556e..6531caa908 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args index 607ce9b0e8..dbe96ae21d 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=2095104k,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args index 9bbde420a9..df7b7f80a9 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=2095104k,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args index 53f0fbc68f..d04d9d73e9 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args index d4238f3d9e..138c8255f7 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args index d4238f3d9e..138c8255f7 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args index 7022d2cc00..f13f04c9d4 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"bind"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args index 9ddfb286b5..f1c49619db 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0],"policy":"interleave"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args index d4238f3d9e..138c8255f7 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.args b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.args index ffbccb8408..76ca5c4bea 100644 --- a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad.x86_64-latest.args b/tests/qemuxml2argvdata/numad.x86_64-latest.args index d4238f3d9e..138c8255f7 100644 --- a/tests/qemuxml2argvdata/numad.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args index 57a2b893f1..e35471d91b 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"preferred"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args b/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args index bf553a8e32..d3960731be 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-expander-test/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,dies=1,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args b/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args index 3fb86c29c2..b179fadc27 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,dies=1,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args b/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args index 7ffcb1d8c5..942540a296 100644 --- a/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu POWER9 \ -m size=2097152k \ -overcommit mem-lock=off \ --smp 8,sockets=2,dies=1,cores=1,threads=4 \ +-smp 8,sockets=2,dies=1,clusters=1,cores=1,threads=4 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824,"host-nodes":[1],"policy":"bind"}' \ -numa node,nodeid=0,cpus=0-3,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":1073741824,"host-nodes":[2],"policy":"bind"}' \ -- 2.43.0

Since aarch64 doesn't support CPU hotplug at the moment, we have to get a bit creative. While the 'query-cpus-fast' output is taken directly from a VM configured as <vcpu current='7'>16</vcpu> <cpu mode='host-passthrough'> <topology sockets='2' dies='1' clusters='2' cores='2' threads='2'/> </cpu> the 'query-hotpluggable-cpus' output is constructed by hand starting from the former and using the 'x86-dies' test data as a model. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; Reviewed-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- ...torjson-cpuinfo-aarch64-clusters-cpus.json | 88 +++++++++ ...json-cpuinfo-aarch64-clusters-hotplug.json | 171 ++++++++++++++++++ ...umonitorjson-cpuinfo-aarch64-clusters.data | 108 +++++++++++ tests/qemumonitorjsontest.c | 9 +- 4 files changed, 375 insertions(+), 1 deletion(-) create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-cpus.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-hotplug.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters.data diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-cpus.json new file mode 100644 index 0000000000..817f65d109 --- /dev/null +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-cpus.json @@ -0,0 +1,88 @@ +{ + "return": [ + { + "thread-id": 284700, + "props": { + "core-id": 0, + "thread-id": 0, + "socket-id": 0, + "cluster-id": 0 + }, + "qom-path": "/machine/unattached/device[0]", + "cpu-index": 0, + "target": "aarch64" + }, + { + "thread-id": 284701, + "props": { + "core-id": 0, + "thread-id": 1, + "socket-id": 0, + "cluster-id": 0 + }, + "qom-path": "/machine/unattached/device[1]", + "cpu-index": 1, + "target": "aarch64" + }, + { + "thread-id": 284702, + "props": { + "core-id": 1, + "thread-id": 0, + "socket-id": 0, + "cluster-id": 0 + }, + "qom-path": "/machine/unattached/device[2]", + "cpu-index": 2, + "target": "aarch64" + }, + { + "thread-id": 284703, + "props": { + "core-id": 1, + "thread-id": 1, + "socket-id": 0, + "cluster-id": 0 + }, + "qom-path": "/machine/unattached/device[3]", + "cpu-index": 3, + "target": "aarch64" + }, + { + "thread-id": 284704, + "props": { + "core-id": 0, + "thread-id": 0, + "socket-id": 0, + "cluster-id": 1 + }, + "qom-path": "/machine/unattached/device[4]", + "cpu-index": 4, + "target": "aarch64" + }, + { + "thread-id": 284705, + "props": { + "core-id": 0, + "thread-id": 1, + "socket-id": 0, + "cluster-id": 1 + }, + "qom-path": "/machine/unattached/device[5]", + "cpu-index": 5, + "target": "aarch64" + }, + { + "thread-id": 284706, + "props": { + "core-id": 1, + "thread-id": 0, + "socket-id": 0, + "cluster-id": 1 + }, + "qom-path": "/machine/unattached/device[6]", + "cpu-index": 6, + "target": "aarch64" + } + ] +} diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-hotplug.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-hotplug.json new file mode 100644 index 0000000000..7ae30bf111 --- /dev/null +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-hotplug.json @@ -0,0 +1,171 @@ +{ + "return": [ + { + "props": { + "core-id": 1, + "thread-id": 1, + "socket-id": 1, + "cluster-id": 1 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 0, + "socket-id": 1, + "cluster-id": 1 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 1, + "socket-id": 1, + "cluster-id": 1 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 0, + "socket-id": 1, + "cluster-id": 1 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 1, + "socket-id": 1, + "cluster-id": 0 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 0, + "socket-id": 1, + "cluster-id": 0 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 1, + "socket-id": 1, + "cluster-id": 0 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 0, + "socket-id": 1, + "cluster-id": 0 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 1, + "socket-id": 0, + "cluster-id": 1 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 0, + "socket-id": 0, + "cluster-id": 1 + }, + "vcpus-count": 1, + "qom-path": "/machine/unattached/device[6]", + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 1, + "socket-id": 0, + "cluster-id": 1 + }, + "vcpus-count": 1, + "qom-path": "/machine/unattached/device[5]", + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 0, + "socket-id": 0, + "cluster-id": 1 + }, + "vcpus-count": 1, + "qom-path": "/machine/unattached/device[4]", + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 1, + "socket-id": 0, + "cluster-id": 0 + }, + "vcpus-count": 1, + "qom-path": "/machine/unattached/device[3]", + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 0, + "socket-id": 0, + "cluster-id": 0 + }, + "vcpus-count": 1, + "qom-path": "/machine/unattached/device[2]", + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 1, + "socket-id": 0, + "cluster-id": 0 + }, + "vcpus-count": 1, + "qom-path": "/machine/unattached/device[1]", + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 0, + "socket-id": 0, + "cluster-id": 0 + }, + "vcpus-count": 1, + "qom-path": "/machine/unattached/device[0]", + "type": "host-arm-cpu" + } + ] +} diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters.data b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters.data new file mode 100644 index 0000000000..87e927e7a8 --- /dev/null +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters.data @@ -0,0 +1,108 @@ +[vcpu libvirt-id='0'] + online=yes + hotpluggable=no + thread-id='284700' + enable-id='1' + query-cpus-id='0' + type='host-arm-cpu' + qom_path='/machine/unattached/device[0]' + topology: socket='0' cluster_id='0' core='0' thread='0' vcpus='1' +[vcpu libvirt-id='1'] + online=yes + hotpluggable=no + thread-id='284701' + enable-id='2' + query-cpus-id='1' + type='host-arm-cpu' + qom_path='/machine/unattached/device[1]' + topology: socket='0' cluster_id='0' core='0' thread='1' vcpus='1' +[vcpu libvirt-id='2'] + online=yes + hotpluggable=no + thread-id='284702' + enable-id='3' + query-cpus-id='2' + type='host-arm-cpu' + qom_path='/machine/unattached/device[2]' + topology: socket='0' cluster_id='0' core='1' thread='0' vcpus='1' +[vcpu libvirt-id='3'] + online=yes + hotpluggable=no + thread-id='284703' + enable-id='4' + query-cpus-id='3' + type='host-arm-cpu' + qom_path='/machine/unattached/device[3]' + topology: socket='0' cluster_id='0' core='1' thread='1' vcpus='1' +[vcpu libvirt-id='4'] + online=yes + hotpluggable=no + thread-id='284704' + enable-id='5' + query-cpus-id='4' + type='host-arm-cpu' + qom_path='/machine/unattached/device[4]' + topology: socket='0' cluster_id='1' core='0' thread='0' vcpus='1' +[vcpu libvirt-id='5'] + online=yes + hotpluggable=no + thread-id='284705' + enable-id='6' + query-cpus-id='5' + type='host-arm-cpu' + qom_path='/machine/unattached/device[5]' + topology: socket='0' cluster_id='1' core='0' thread='1' vcpus='1' +[vcpu libvirt-id='6'] + online=yes + hotpluggable=no + thread-id='284706' + enable-id='7' + query-cpus-id='6' + type='host-arm-cpu' + qom_path='/machine/unattached/device[6]' + topology: socket='0' cluster_id='1' core='1' thread='0' vcpus='1' +[vcpu libvirt-id='7'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='0' cluster_id='1' core='1' thread='1' vcpus='1' +[vcpu libvirt-id='8'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='1' cluster_id='0' core='0' thread='0' vcpus='1' +[vcpu libvirt-id='9'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='1' cluster_id='0' core='0' thread='1' vcpus='1' +[vcpu libvirt-id='10'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='1' cluster_id='0' core='1' thread='0' vcpus='1' +[vcpu libvirt-id='11'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='1' cluster_id='0' core='1' thread='1' vcpus='1' +[vcpu libvirt-id='12'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='1' cluster_id='1' core='0' thread='0' vcpus='1' +[vcpu libvirt-id='13'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='1' cluster_id='1' core='0' thread='1' vcpus='1' +[vcpu libvirt-id='14'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='1' cluster_id='1' core='1' thread='0' vcpus='1' +[vcpu libvirt-id='15'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='1' cluster_id='1' core='1' thread='1' vcpus='1' diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index d9ebb429e7..45cee23798 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2262,13 +2262,16 @@ testQemuMonitorCPUInfoFormat(qemuMonitorCPUInfo *vcpus, if (vcpu->qom_path) virBufferAsprintf(&buf, "qom_path='%s'\n", vcpu->qom_path); - if (vcpu->socket_id != -1 || vcpu->core_id != -1 || + if (vcpu->socket_id != -1 || vcpu->die_id != -1 || + vcpu->cluster_id != -1 || vcpu->core_id != -1 || vcpu->thread_id != -1 || vcpu->vcpus != 0) { virBufferAddLit(&buf, "topology:"); if (vcpu->socket_id != -1) virBufferAsprintf(&buf, " socket='%d'", vcpu->socket_id); if (vcpu->die_id != -1) virBufferAsprintf(&buf, " die='%d'", vcpu->die_id); + if (vcpu->cluster_id != -1) + virBufferAsprintf(&buf, " cluster_id='%d'", vcpu->cluster_id); if (vcpu->core_id != -1) virBufferAsprintf(&buf, " core='%d'", vcpu->core_id); if (vcpu->thread_id != -1) @@ -2919,6 +2922,10 @@ mymain(void) DO_TEST_CPU_INFO("ppc64-hotplug-4", 24); DO_TEST_CPU_INFO("ppc64-no-threads", 16); + /* aarch64 doesn't support CPU hotplug yet, so the data used in + * this test is partially synthetic */ + DO_TEST_CPU_INFO("aarch64-clusters", 16); + DO_TEST_CPU_INFO("s390", 2); -- 2.43.0

On Thu, Jan 11, 2024 at 15:26:41 +0100, Andrea Bolognani wrote: [....] IIRC the bit about 'core_id' is not true, at least for some older AMD cpus which had two fixed point units (each having it's own core id) sharing a FPU and some other less-used modules. That was a long time ago though, but the distinction was that the lowest level cache was shared at this level (again IIRC) See commit 828820e2d371205d6a6061301165d58a1a92e611 ; the 'bulldozer' example. I'm not sure what to do with the siblings thing, but the rest: Reviewed-by: Peter Krempa <pkrempa(a)redhat.com&gt;

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- docs/formatcaps.rst | 24 +++++++++++++++--------- docs/formatdomain.rst | 18 ++++++++++-------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/docs/formatcaps.rst b/docs/formatcaps.rst index 60f8b7caca..d16cf182dc 100644 --- a/docs/formatcaps.rst +++ b/docs/formatcaps.rst @@ -77,6 +77,12 @@ The ``<host/>`` element consists of the following child elements: Note that not all architectures support CPU dies: if the current architecture doesn't, the value will be 0 for all CPUs. + ``cluster_id`` + Identifier for the cluster the CPU is in. + + Note that not all architectures support CPU clusters: if the current + architecture doesn't, the value will be 0 for all CPUs. + ``core_id`` Identifier for the core the CPU is in. @@ -196,7 +202,7 @@ capabilities enabled in the chip and BIOS you will see: <microcode version='236'/> <signature family='6' model='142' stepping='12'/> <counter name='tsc' frequency='2303997000' scaling='no'/> - <topology sockets='1' dies='1' cores='4' threads='2'/> + <topology sockets='1' dies='1' clusters='1' cores='4' threads='2'/> <maxphysaddr mode='emulate' bits='39'/> <feature name='ds'/> <feature name='acpi'/> @@ -261,14 +267,14 @@ capabilities enabled in the chip and BIOS you will see: <sibling id='0' value='10'/> </distances> <cpus num='8'> - <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0,4'/> - <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1,5'/> - <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2,6'/> - <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3,7'/> - <cpu id='4' socket_id='0' die_id='0' core_id='0' siblings='0,4'/> - <cpu id='5' socket_id='0' die_id='0' core_id='1' siblings='1,5'/> - <cpu id='6' socket_id='0' die_id='0' core_id='2' siblings='2,6'/> - <cpu id='7' socket_id='0' die_id='0' core_id='3' siblings='3,7'/> + <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0,4'/> + <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1,5'/> + <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2,6'/> + <cpu id='3' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3,7'/> + <cpu id='4' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0,4'/> + <cpu id='5' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1,5'/> + <cpu id='6' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2,6'/> + <cpu id='7' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3,7'/> </cpus> </cell> </cells> diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 73deaa5cb3..67d5f958d5 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -1377,7 +1377,7 @@ following collection of elements. :since:`Since 0.7.5` <cpu match='exact'> <model fallback='allow'>core2duo</model> <vendor>Intel</vendor> - <topology sockets='1' dies='1' cores='2' threads='1'/> + <topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/> <cache level='3' mode='emulate'/> <maxphysaddr mode='emulate' bits='42'/> <feature policy='disable' name='lahf_lm'/> @@ -1388,7 +1388,7 @@ following collection of elements. :since:`Since 0.7.5` <cpu mode='host-model'> <model fallback='forbid'/> - <topology sockets='1' dies='1' cores='2' threads='1'/> + <topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/> </cpu> ... @@ -1414,7 +1414,7 @@ In case no restrictions need to be put on CPU model and its features, a simpler ... <cpu> - <topology sockets='1' dies='1' cores='2' threads='1'/> + <topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/> </cpu> ... @@ -1579,12 +1579,14 @@ In case no restrictions need to be put on CPU model and its features, a simpler ``topology`` The ``topology`` element specifies requested topology of virtual CPU provided to the guest. - Its attributes ``sockets``, ``dies`` (:since:`Since 6.1.0`), ``cores``, - and ``threads`` accept non-zero positive integer values. + Its attributes ``sockets``, ``dies`` (:since:`Since 6.1.0`), ``clusters`` + (:since:`Since 10.1.0`), ``cores``, and ``threads`` accept non-zero positive + integer values. They refer to the total number of CPU sockets, number of dies per socket, - number of cores per die, and number of threads per core, respectively. - The ``dies`` attribute is optional and will default to 1 if omitted, while - the other attributes are all mandatory. + number of clusters per die, number of cores per cluster, and number of + threads per core, respectively. + The ``dies`` and ``clusters`` attributes are optional and will default to 1 + if omitted, while the other attributes are all mandatory. Hypervisors may require that the maximum number of vCPUs specified by the ``cpus`` element equals to the number of vcpus resulting from the topology. -- 2.43.0

On Fri, Jan 12, 2024 at 05:18:57PM +0100, Peter Krempa wrote: I'll squash in the diff below before pushing. diff --git a/docs/formatcaps.rst b/docs/formatcaps.rst index d16cf182dc..f37532296f 100644 --- a/docs/formatcaps.rst +++ b/docs/formatcaps.rst @@ -90,7 +90,7 @@ The ``<host/>`` element consists of the following child elements: List of CPUs that are in the same core. The list will include the current CPU, plus all other CPUs that have the - same values for ``socket_id``, ``die_id`` and ``core_id``. + same values for ``socket_id``, ``die_id``, ``cluster_id`` and ``core_id``. ``secmodel`` To find out default security labels for different security models you need to -- Andrea Bolognani / Red Hat / Virtualization