mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

machine: Tweak the order of topology members in struct CpuTopology

Browse Source 
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>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210929025816.21076-12-wangyanan55@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Yanan Wang 2021-09-29 10:58:11 +08:00 committed by Paolo Bonzini
parent 69fc28a78d
commit 003f230e37
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/core/machine.c
View File

@ -829,11 +829,11 @@ static void machine_get_smp(Object *obj, Visitor *v, const char *name,
{ {
MachineState *ms = MACHINE(obj); MachineState *ms = MACHINE(obj);
SMPConfiguration *config = &(SMPConfiguration){ SMPConfiguration *config = &(SMPConfiguration){
.has_cores = true, .cores = ms->smp.cores, .has_cpus = true, .cpus = ms->smp.cpus,
.has_sockets = true, .sockets = ms->smp.sockets, .has_sockets = true, .sockets = ms->smp.sockets,
.has_dies = true, .dies = ms->smp.dies, .has_dies = true, .dies = ms->smp.dies,
.has_cores = true, .cores = ms->smp.cores,
.has_threads = true, .threads = ms->smp.threads, .has_threads = true, .threads = ms->smp.threads,
.has_cpus = true, .cpus = ms->smp.cpus,
.has_maxcpus = true, .maxcpus = ms->smp.max_cpus, .has_maxcpus = true, .maxcpus = ms->smp.max_cpus,
}; };
if (!visit_type_SMPConfiguration(v, name, &config, &error_abort)) { if (!visit_type_SMPConfiguration(v, name, &config, &error_abort)) {
@ -1060,10 +1060,10 @@ static void machine_initfn(Object *obj)
/* default to mc->default_cpus */ /* default to mc->default_cpus */
ms->smp.cpus = mc->default_cpus; ms->smp.cpus = mc->default_cpus;
ms->smp.max_cpus = mc->default_cpus; ms->smp.max_cpus = mc->default_cpus;
ms->smp.cores = 1;
ms->smp.dies = 1;
ms->smp.threads = 1;
ms->smp.sockets = 1; ms->smp.sockets = 1;
ms->smp.dies = 1;
ms->smp.cores = 1;
ms->smp.threads = 1;
} }
static void machine_finalize(Object *obj) static void machine_finalize(Object *obj)

7
include/hw/boards.h
View File

@ -275,17 +275,18 @@ typedef struct DeviceMemoryState {
/** /**
* CpuTopology: * CpuTopology:
* @cpus: the number of present logical processors on the machine * @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 * @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 * @max_cpus: the maximum number of logical processors on the machine
*/ */
typedef struct CpuTopology { typedef struct CpuTopology {
unsigned int cpus; unsigned int cpus;
unsigned int sockets;
unsigned int dies; unsigned int dies;
unsigned int cores; unsigned int cores;
unsigned int threads; unsigned int threads;
unsigned int sockets;
unsigned int max_cpus; unsigned int max_cpus;
} CpuTopology; } CpuTopology;