On 06/03/2024 10.53, Zhao Liu wrote:
From: Zhao Liu <zhao1....@intel.com>
SMPConfiguration initializes its int64_t members as 0 by default.
Can we always rely on that? ... or is this just by luck due to the current
implementation? In the latter case, I'd maybe rather drop this patch again.
Thomas
Therefore, in machine_parse_smp_config(), initialize local topology
variables with SMPConfiguration's members directly.
Suggested-by: Prasad Pandit <p...@fedoraproject.org>
Signed-off-by: Zhao Liu <zhao1....@intel.com>
---
hw/core/machine-smp.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c
index 50a5a40dbc3d..3d9799aef039 100644
--- a/hw/core/machine-smp.c
+++ b/hw/core/machine-smp.c
@@ -82,15 +82,15 @@ void machine_parse_smp_config(MachineState *ms,
const SMPConfiguration *config, Error **errp)
{
MachineClass *mc = MACHINE_GET_CLASS(ms);
- unsigned cpus = config->has_cpus ? config->cpus : 0;
- unsigned drawers = config->has_drawers ? config->drawers : 0;
- unsigned books = config->has_books ? config->books : 0;
- unsigned sockets = config->has_sockets ? config->sockets : 0;
- unsigned dies = config->has_dies ? config->dies : 0;
- unsigned clusters = config->has_clusters ? config->clusters : 0;
- unsigned cores = config->has_cores ? config->cores : 0;
- unsigned threads = config->has_threads ? config->threads : 0;
- unsigned maxcpus = config->has_maxcpus ? config->maxcpus : 0;
+ unsigned cpus = config->cpus;
+ unsigned drawers = config->drawers;
+ unsigned books = config->books;
+ unsigned sockets = config->sockets;
+ unsigned dies = config->dies;
+ unsigned clusters = config->clusters;
+ unsigned cores = config->cores;
+ unsigned threads = config->threads;
+ unsigned maxcpus = config->maxcpus;
/*
* Specified CPU topology parameters must be greater than zero,
