Initialize boot CPUs specified with -smp option as CPU core devices. Create as many CPU package devices as necessary to fit in max_cpus and populate (i,e., realize) only as many as required.
Signed-off-by: Bharata B Rao <bhar...@linux.vnet.ibm.com> --- hw/ppc/spapr.c | 31 +++++++++++++++++++++++-------- include/hw/ppc/spapr_cpu_package.h | 1 + 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 3892a99..f3913b4 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -64,6 +64,8 @@ #include "hw/compat.h" #include "qemu-common.h" +#include "hw/ppc/spapr_cpu_package.h" +#include "monitor/monitor.h" #include <libfdt.h> @@ -1739,7 +1741,6 @@ static void ppc_spapr_init(MachineState *machine) const char *kernel_filename = machine->kernel_filename; const char *kernel_cmdline = machine->kernel_cmdline; const char *initrd_filename = machine->initrd_filename; - PowerPCCPU *cpu; PCIHostState *phb; int i; MemoryRegion *sysmem = get_system_memory(); @@ -1753,6 +1754,8 @@ static void ppc_spapr_init(MachineState *machine) long load_limit, fw_size; bool kernel_le = false; char *filename; + int spapr_packages = smp_cpus / smp_threads; + int spapr_max_packages = max_cpus / smp_threads; msi_supported = true; @@ -1825,13 +1828,18 @@ static void ppc_spapr_init(MachineState *machine) } machine->cpu_type = TYPE_POWERPC_CPU; - for (i = 0; i < smp_cpus; i++) { - cpu = cpu_ppc_init(machine->cpu_model); - if (cpu == NULL) { - error_report("Unable to find PowerPC CPU definition"); - exit(1); + /* + * Create enough CPU package devices for max_cpus and realize the + * required number of them. + */ + for (i = 0; i < spapr_max_packages; i++) { + Object *spapr_cpu_package = + cpu_package_create_object(TYPE_SPAPR_CPU_PACKAGE, i, &error_fatal); + + if (i < spapr_packages) { + object_property_set_bool(spapr_cpu_package, true, "realized", + &error_fatal); } - spapr_cpu_init(spapr, cpu, &error_fatal); } if (kvm_enabled()) { @@ -2231,6 +2239,7 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(qdev_get_machine()); + sPAPRMachineState *ms = SPAPR_MACHINE(hotplug_dev); if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { int node; @@ -2267,6 +2276,11 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, } spapr_memory_plug(hotplug_dev, dev, node, errp); + } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { + CPUState *cs = CPU(dev); + PowerPCCPU *cpu = POWERPC_CPU(cs); + + spapr_cpu_init(ms, cpu, errp); } } @@ -2281,7 +2295,8 @@ static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev, static HotplugHandler *spapr_get_hotpug_handler(MachineState *machine, DeviceState *dev) { - if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) || + object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { return HOTPLUG_HANDLER(machine); } return NULL; diff --git a/include/hw/ppc/spapr_cpu_package.h b/include/hw/ppc/spapr_cpu_package.h index 547dbc1..a3810d8 100644 --- a/include/hw/ppc/spapr_cpu_package.h +++ b/include/hw/ppc/spapr_cpu_package.h @@ -10,6 +10,7 @@ #define HW_SPAPR_CPU_PACKAGE_H #include "hw/qdev.h" +#include "hw/cpu/package.h" #define TYPE_SPAPR_CPU_PACKAGE "spapr-cpu-package" #define SPAPR_CPU_PACKAGE(obj) \ -- 2.1.0