system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-09-21 03:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

hw/boards: Add struct CpuTopology to MachineState

Browse source 
The cpu topology property CpuTopology is added to the MachineState
and its members are initialized with the leagcy global smp variables.

From this commit, the code in the system emulation mode is supposed to
use cpu topology variables from MachineState instead of the global ones
defined in vl.c and there is no semantic change.

Suggested-by: Igor Mammedov <imammedo@redhat.com>
Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Like Xu <like.xu@linux.intel.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20190518205428.90532-2-like.xu@linux.intel.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Like Xu 2019-05-19 04:54:19 +08:00 committed by Eduardo Habkost
parent d2c5f91ca9
commit edeeec9117
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/hw/boards.h
View file

@ -232,6 +232,20 @@ typedef struct DeviceMemoryState {
MemoryRegion mr; MemoryRegion mr;
} DeviceMemoryState; } 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
* @max_cpus: the maximum number of logical processors on the machine
*/
typedef struct CpuTopology {
unsigned int cpus;
unsigned int cores;
unsigned int threads;
unsigned int max_cpus;
} CpuTopology;
/** /**
* MachineState: * MachineState:
*/ */
@ -274,6 +288,7 @@ struct MachineState {
const char *cpu_type; const char *cpu_type;
AccelState *accelerator; AccelState *accelerator;
CPUArchIdList *possible_cpus; CPUArchIdList *possible_cpus;
CpuTopology smp;
struct NVDIMMState *nvdimms_state; struct NVDIMMState *nvdimms_state;
}; };

5
vl.c
View file

@ -4014,6 +4014,11 @@ int main(int argc, char **argv, char **envp)
smp_parse(qemu_opts_find(qemu_find_opts("smp-opts"), NULL)); smp_parse(qemu_opts_find(qemu_find_opts("smp-opts"), NULL));
current_machine->smp.cpus = smp_cpus;
current_machine->smp.max_cpus = max_cpus;
current_machine->smp.cores = smp_cores;
current_machine->smp.threads = smp_threads;
/* sanity-check smp_cpus and max_cpus against machine_class */ /* sanity-check smp_cpus and max_cpus against machine_class */
if (smp_cpus < machine_class->min_cpus) { if (smp_cpus < machine_class->min_cpus) {
error_report("Invalid SMP CPUs %d. The min CPUs " error_report("Invalid SMP CPUs %d. The min CPUs "