[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 12/29] hw/i386: Adjust nr_dies with configured smp
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL v2 12/29] hw/i386: Adjust nr_dies with configured smp_dies for PCMachine |
Date: |
Fri, 28 Jun 2019 15:47:25 -0300 |
From: Like Xu <address@hidden>
To support multiple dies configuration on PCMachine, the best place to
set CPUX86State->nr_dies with requested PCMachineState->smp_dies is in
pc_new_cpu() and pc_cpu_pre_plug(). Refactoring pc_new_cpu() is applied
and redundant parameter "const char *typename" would be removed.
Suggested-by: Eduardo Habkost <address@hidden>
Signed-off-by: Like Xu <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/i386/pc.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index e18b1bade2..211015324a 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1518,12 +1518,16 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int
level)
}
}
-static void pc_new_cpu(const char *typename, int64_t apic_id, Error **errp)
+static void pc_new_cpu(PCMachineState *pcms, int64_t apic_id, Error **errp)
{
Object *cpu = NULL;
Error *local_err = NULL;
+ CPUX86State *env = NULL;
- cpu = object_new(typename);
+ cpu = object_new(MACHINE(pcms)->cpu_type);
+
+ env = &X86_CPU(cpu)->env;
+ env->nr_dies = pcms->smp_dies;
object_property_set_uint(cpu, apic_id, "apic-id", &local_err);
object_property_set_bool(cpu, true, "realized", &local_err);
@@ -1549,7 +1553,7 @@ void pc_hot_add_cpu(MachineState *ms, const int64_t id,
Error **errp)
return;
}
- pc_new_cpu(ms->cpu_type, apic_id, &local_err);
+ pc_new_cpu(PC_MACHINE(ms), apic_id, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
@@ -1574,8 +1578,7 @@ void pc_cpus_init(PCMachineState *pcms)
ms->smp.max_cpus - 1) + 1;
possible_cpus = mc->possible_cpu_arch_ids(ms);
for (i = 0; i < ms->smp.cpus; i++) {
- pc_new_cpu(possible_cpus->cpus[i].type, possible_cpus->cpus[i].arch_id,
- &error_fatal);
+ pc_new_cpu(pcms, possible_cpus->cpus[i].arch_id, &error_fatal);
}
}
@@ -2295,6 +2298,7 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
CPUArchId *cpu_slot;
X86CPUTopoInfo topo;
X86CPU *cpu = X86_CPU(dev);
+ CPUX86State *env = &cpu->env;
MachineState *ms = MACHINE(hotplug_dev);
PCMachineState *pcms = PC_MACHINE(hotplug_dev);
unsigned int smp_cores = ms->smp.cores;
@@ -2306,6 +2310,8 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
return;
}
+ env->nr_dies = pcms->smp_dies;
+
/*
* If APIC ID is not set,
* set it based on socket/die/core/thread properties.
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-devel] [PULL v2 02/29] machine: Refactor smp-related call chains to pass MachineState, (continued)
- [Qemu-devel] [PULL v2 02/29] machine: Refactor smp-related call chains to pass MachineState, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 03/29] general: Replace global smp variables with smp machine properties, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 05/29] hw/riscv: Replace global smp variables with machine smp properties, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 04/29] hw/ppc: Replace global smp variables with machine smp properties, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 06/29] hw/s390x: Replace global smp variables with machine smp properties, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 07/29] hw/i386: Replace global smp variables with machine smp properties, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 08/29] hw/arm: Replace global smp variables with machine smp properties, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 09/29] hw: Replace global smp variables with MachineState for all remaining archs, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 10/29] vl.c: Replace smp global variables with smp machine properties, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 11/29] i386: Add die-level cpu topology to x86CPU on PCMachine, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 12/29] hw/i386: Adjust nr_dies with configured smp_dies for PCMachine,
Eduardo Habkost <=
- [Qemu-devel] [PULL v2 13/29] i386/cpu: Consolidate die-id validity in smp context, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 14/29] i386: Update new x86_apicid parsing rules with die_offset support, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 15/29] pc: fix possible NULL pointer dereference in pc_machine_get_device_memory_region_size(), Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 16/29] machine: show if CLI option '-numa node, mem' is supported in QAPI schema, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 18/29] numa: deprecate implict memory distribution between nodes, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 17/29] numa: deprecate 'mem' parameter of '-numa node' option, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 19/29] hppa: Delete unused hppa_cpu_list() function, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 20/29] target/i386: fix feature check in hyperv-stub.c, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 21/29] deprecate -mem-path fallback to anonymous RAM, Eduardo Habkost, 2019/06/28
- [Qemu-devel] [PULL v2 22/29] i386: Don't print warning if phys-bits was set automatically, Eduardo Habkost, 2019/06/28