diff options
| author | Like Xu | 2019-06-12 10:40:56 +0200 |
|---|---|---|
| committer | Eduardo Habkost | 2019-07-05 22:08:03 +0200 |
| commit | c26ae610811e8d52f4fc73e3ae0a8bc4a24d6763 (patch) | |
| tree | c1a50b3db284c3ac7e9a406cffb256577912fe49 /hw/i386/pc.c | |
| parent | vl.c: Replace smp global variables with smp machine properties (diff) | |
| download | qemu-c26ae610811e8d52f4fc73e3ae0a8bc4a24d6763.tar.gz qemu-c26ae610811e8d52f4fc73e3ae0a8bc4a24d6763.tar.xz qemu-c26ae610811e8d52f4fc73e3ae0a8bc4a24d6763.zip | |
i386: Add die-level cpu topology to x86CPU on PCMachine
The die-level as the first PC-specific cpu topology is added to the leagcy
cpu topology model, which has one die per package implicitly and only the
numbers of sockets/cores/threads are configurable.
In the new model with die-level support, the total number of logical
processors (including offline) on board will be calculated as:
#cpus = #sockets * #dies * #cores * #threads
and considering compatibility, the default value for #dies would be
initialized to one in x86_cpu_initfn() and pc_machine_initfn().
Signed-off-by: Like Xu <like.xu@linux.intel.com>
Message-Id: <20190612084104.34984-2-like.xu@linux.intel.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/i386/pc.c')
| -rw-r--r-- | hw/i386/pc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 269e44f0d0..d44b2d06db 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2303,9 +2303,13 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, return; } - /* if APIC ID is not set, set it based on socket/core/thread properties */ + /* + * If APIC ID is not set, + * set it based on socket/die/core/thread properties. + */ if (cpu->apic_id == UNASSIGNED_APIC_ID) { - int max_socket = (ms->smp.max_cpus - 1) / smp_threads / smp_cores; + int max_socket = (ms->smp.max_cpus - 1) / + smp_threads / smp_cores / pcms->smp_dies; if (cpu->socket_id < 0) { error_setg(errp, "CPU socket-id is not set"); @@ -2684,6 +2688,7 @@ static void pc_machine_initfn(Object *obj) pcms->smbus_enabled = true; pcms->sata_enabled = true; pcms->pit_enabled = true; + pcms->smp_dies = 1; pc_system_flash_create(pcms); } |