From patchwork Mon Feb 22 05:01:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bharata B Rao X-Patchwork-Id: 8371811 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1A2DC9F314 for ; Mon, 22 Feb 2016 05:03:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 685612039E for ; Mon, 22 Feb 2016 05:03:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 98B9620380 for ; Mon, 22 Feb 2016 05:03:00 +0000 (UTC) Received: from localhost ([::1]:47033 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXieC-0001iz-10 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 22 Feb 2016 00:03:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXidw-0001e1-BL for qemu-devel@nongnu.org; Mon, 22 Feb 2016 00:02:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aXids-0004mR-Tz for qemu-devel@nongnu.org; Mon, 22 Feb 2016 00:02:44 -0500 Received: from e23smtp03.au.ibm.com ([202.81.31.145]:55699) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXids-0004m2-D2 for qemu-devel@nongnu.org; Mon, 22 Feb 2016 00:02:40 -0500 Received: from localhost by e23smtp03.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 22 Feb 2016 15:02:38 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp03.au.ibm.com (202.81.31.209) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 22 Feb 2016 15:02:35 +1000 X-IBM-Helo: d23dlp01.au.ibm.com X-IBM-MailFrom: bharata@linux.vnet.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org Received: from d23relay07.au.ibm.com (d23relay07.au.ibm.com [9.190.26.37]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 35E2D2CE8054 for ; Mon, 22 Feb 2016 16:02:35 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay07.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u1M52RHr917934 for ; Mon, 22 Feb 2016 16:02:35 +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 u1M522eR015116 for ; Mon, 22 Feb 2016 16:02:03 +1100 Received: from bharata.in.ibm.com ([9.124.35.110]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u1M51kl5013892; Mon, 22 Feb 2016 16:02:00 +1100 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Mon, 22 Feb 2016 10:31:22 +0530 Message-Id: <1456117285-22273-6-git-send-email-bharata@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1456117285-22273-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1456117285-22273-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16022205-0009-0000-0000-000003066D1E X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 202.81.31.145 Cc: ehabkost@redhat.com, aik@ozlabs.ru, Bharata B Rao , agraf@suse.de, armbru@redhat.com, pbonzini@redhat.com, imammedo@redhat.com, afaerber@suse.de, david@gibson.dropbear.id.au Subject: [Qemu-devel] [RFC PATCH v0 5/8] spapr: Convert boot CPUs into CPU core device initialization X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 @@ -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) \