From: Zhao Liu <zhao1....@intel.com>
The number of cores/threads per socket are needed for smbios, and are
also useful for other modules.
Provide the helpers to wrap the calculation of cores/threads per socket
so that we can avoid calculation errors caused by other modules miss
topology changes.
Suggested-by: Igor Mammedov <imamm...@redhat.com>
Signed-off-by: Zhao Liu <zhao1....@intel.com>
---
v4:
* Put the declarations/definitions after machine_parse_smp_config()
to avoid missing future topology related changes. (Igor)
v3:
* The new patch to wrap the calculation of cores/threads per socket.
---
hw/core/machine-smp.c | 10 ++++++++++
include/hw/boards.h | 2 ++
2 files changed, 12 insertions(+)
diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c
index 89fe0cda4275..0f4d9b6f7a9f 100644
--- a/hw/core/machine-smp.c
+++ b/hw/core/machine-smp.c
@@ -197,3 +197,13 @@ void machine_parse_smp_config(MachineState *ms,
return;
}
}
+
+unsigned int machine_topo_get_cores_per_socket(const MachineState *ms)
+{
+ return ms->smp.cores * ms->smp.clusters * ms->smp.dies;
+}
+
+unsigned int machine_topo_get_threads_per_socket(const MachineState *ms)
+{
+ return ms->smp.threads * machine_topo_get_cores_per_socket(ms);
+}
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 6b267c21ce7d..12d9e9d17ce9 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -35,6 +35,8 @@ void machine_set_cpu_numa_node(MachineState *machine,
Error **errp);
void machine_parse_smp_config(MachineState *ms,
const SMPConfiguration *config, Error **errp);
+unsigned int machine_topo_get_cores_per_socket(const MachineState *ms);
+unsigned int machine_topo_get_threads_per_socket(const MachineState *ms);
/**
* machine_class_allow_dynamic_sysbus_dev: Add type to list of valid devices
--
2.34.1
