[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-6.2 v3 08/11] machine: Tweak the order of topology members in
From: |
Yanan Wang |
Subject: |
[PATCH for-6.2 v3 08/11] machine: Tweak the order of topology members in struct CpuTopology |
Date: |
Wed, 28 Jul 2021 11:48:45 +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.
Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
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 e13a8f2f34..9223ece3ea 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -1057,10 +1057,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 2ae039b74f..2a1bba86c0 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
- [PATCH for-6.2 v3 00/11] machine: smp parsing fixes and improvement, Yanan Wang, 2021/07/27
- [PATCH for-6.2 v3 05/11] hw: Add compat machines for 6.2, Yanan Wang, 2021/07/27
- [PATCH for-6.2 v3 01/11] machine: Minor refactor/cleanup for the smp parsers, Yanan Wang, 2021/07/27
- [PATCH for-6.2 v3 08/11] machine: Tweak the order of topology members in struct CpuTopology,
Yanan Wang <=
- [PATCH for-6.2 v3 04/11] machine: Improve the error reporting of smp parsing, Yanan Wang, 2021/07/27
- [PATCH for-6.2 v3 02/11] machine: Uniformly use maxcpus to calculate the omitted parameters, Yanan Wang, 2021/07/27
- [PATCH for-6.2 v3 07/11] machine: Use ms instead of global current_machine in sanity-check, Yanan Wang, 2021/07/27
- [PATCH for-6.2 v3 10/11] machine: Remove smp_parse callback from MachineClass, Yanan Wang, 2021/07/27
- [PATCH for-6.2 v3 09/11] machine: Make smp_parse generic enough for all arches, Yanan Wang, 2021/07/27