[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 6/6] machine: Tweak the order of topology members in struct C
From: |
Yanan Wang |
Subject: |
[RFC PATCH 6/6] machine: Tweak the order of topology members in struct CpuTopology |
Date: |
Fri, 2 Jul 2021 18:07:39 +0800 |
Now that all the possible topology parameters are integrated in struct
CpuTopology, tweak the order of topology members to be "cpus/sockets/
dies/cores/threads/maxcpus" for readability and consistency. We also
tweak the comment by adding explanation of dies parameter.
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
---
hw/core/machine.c | 4 ++--
include/hw/boards.h | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 55785feee2..8c538d2ba5 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -968,10 +968,10 @@ static void machine_initfn(Object *obj)
/* default to mc->default_cpus */
ms->smp.cpus = mc->default_cpus;
ms->smp.max_cpus = mc->default_cpus;
- ms->smp.cores = 1;
+ ms->smp.sockets = 1;
ms->smp.dies = 1;
+ ms->smp.cores = 1;
ms->smp.threads = 1;
- ms->smp.sockets = 1;
}
static void machine_finalize(Object *obj)
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 1eae4427e8..3b64757981 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -275,17 +275,18 @@ typedef struct DeviceMemoryState {
/**
* CpuTopology:
* @cpus: the number of present logical processors on the machine
- * @cores: the number of cores in one package
- * @threads: the number of threads in one core
* @sockets: the number of sockets on the machine
+ * @dies: the number of dies in one socket
+ * @cores: the number of cores in one die
+ * @threads: the number of threads in one core
* @max_cpus: the maximum number of logical processors on the machine
*/
typedef struct CpuTopology {
unsigned int cpus;
+ unsigned int sockets;
unsigned int dies;
unsigned int cores;
unsigned int threads;
- unsigned int sockets;
unsigned int max_cpus;
} CpuTopology;
--
2.19.1
- Re: [RFC PATCH 3/6] pc/machine: Perform zero-check for the value of -smp dies, (continued)
[RFC PATCH 5/6] pc/machine: Disallow any configuration of dies for non-PC machines, Yanan Wang, 2021/07/02
[RFC PATCH 2/6] machine: Perform zero-check for the computed value of sockets, Yanan Wang, 2021/07/02
[RFC PATCH 6/6] machine: Tweak the order of topology members in struct CpuTopology,
Yanan Wang <=
[RFC PATCH 4/6] machine: Uniformly use maxcpus to calculate the missing values, Yanan Wang, 2021/07/02
[RFC PATCH 1/6] machine: Set the value of maxcpus to match cpus if specified as zero, Yanan Wang, 2021/07/02