From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6uXM-0002nc-0n for qemu-devel@nongnu.org; Thu, 10 Dec 2015 01:17:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a6uXI-00038M-LS for qemu-devel@nongnu.org; Thu, 10 Dec 2015 01:17:07 -0500 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:49747) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6uXI-00037p-4c for qemu-devel@nongnu.org; Thu, 10 Dec 2015 01:17:04 -0500 Received: from localhost by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 10 Dec 2015 16:17:01 +1000 Received: from d23relay08.au.ibm.com (d23relay08.au.ibm.com [9.185.71.33]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 1C02F3578054 for ; Thu, 10 Dec 2015 17:17:00 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay08.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tBA6GYaU36700248 for ; Thu, 10 Dec 2015 17:16:42 +1100 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tBA6GRJq030548 for ; Thu, 10 Dec 2015 17:16:27 +1100 From: Bharata B Rao Date: Thu, 10 Dec 2015 11:45:42 +0530 Message-Id: <1449728144-6223-8-git-send-email-bharata@linux.vnet.ibm.com> In-Reply-To: <1449728144-6223-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1449728144-6223-1-git-send-email-bharata@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC PATCH v0 7/9] spapr: Convert boot CPUs into CPU core device initialization List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, ehabkost@redhat.com, Bharata B Rao , agraf@suse.de, borntraeger@de.ibm.com, imammedo@redhat.com, pbonzini@redhat.com, afaerber@suse.de, david@gibson.dropbear.id.au Initialize boot CPUs specified with -smp option as CPU core devices. Signed-off-by: Bharata B Rao --- hw/ppc/spapr.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index db441f2..9499871 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -63,7 +63,7 @@ #include "hw/compat.h" #include "qemu-common.h" - +#include "hw/cpu/core.h" #include /* SLOF memory layout: @@ -1713,9 +1713,8 @@ 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; + int i, j; MemoryRegion *sysmem = get_system_memory(); MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *rma_region; @@ -1727,6 +1726,7 @@ static void ppc_spapr_init(MachineState *machine) long load_limit, fw_size; bool kernel_le = false; char *filename; + int sockets = DIV_ROUND_UP(smp_cpus, smp_cores * smp_threads); msi_supported = true; @@ -1799,13 +1799,16 @@ 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) { - fprintf(stderr, "Unable to find PowerPC CPU definition\n"); - exit(1); + for (i = 0; i < sockets; i++) { + char sid[32]; + + snprintf(sid, 32, "" TYPE_CPU_SOCKET "%d", i); + for (j = 0; j < smp_cores; j++) { + Object *core = object_new(TYPE_CPU_CORE); + + object_property_set_str(core, sid, "socket", &error_abort); + object_property_set_bool(core, true, "realized", &error_abort); } - spapr_cpu_init(spapr, cpu); } if (kvm_enabled()) { @@ -2192,6 +2195,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; @@ -2228,6 +2232,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); } } @@ -2242,7 +2251,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; -- 2.1.0