From: Zhao Liu <zhao1....@intel.com>
Here're 2 mistakes:
1. 003f230 (machine: Tweak the order of topology members in struct
CpuTopology) changes the meaning of smp.cores but doesn't fix
original smp.cores uses. And because of the introduction of cluster,
now smp.cores means the number of cores in one cluster. So smp.cores
* smp.threads just means the cpus in a cluster not in a socket.
2. smp.cpus means the number of initial online cpus, not the total
number of cpus. For such topology calculation, smp.max_cpus
should be considered.
Since the number of sockets has already been recorded in smp structure,
use smp.sockets directly.
Cc: Michael S. Tsirkin <m...@redhat.com>
Cc: Igor Mammedov <imamm...@redhat.com>
Cc: Ani Sinha <a...@anisinha.ca>
Fixes: 003f230 (machine: Tweak the order of topology members in struct
CpuTopology)
Signed-off-by: Zhao Liu <zhao1....@intel.com>
---
hw/smbios/smbios.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 4869566cf5df..993e8d899b9a 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -1086,8 +1086,7 @@ void smbios_get_tables(MachineState *ms,
smbios_build_type_2_table();
smbios_build_type_3_table();
- smbios_smp_sockets = DIV_ROUND_UP(ms->smp.cpus,
- ms->smp.cores * ms->smp.threads);
+ smbios_smp_sockets = ms->smp.sockets;
assert(smbios_smp_sockets >= 1);
for (i = 0; i < smbios_smp_sockets; i++) {
--
2.34.1
