From patchwork Tue Mar 8 13:18:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 8534021 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5FD1BC0553 for ; Tue, 8 Mar 2016 13:20:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8DD792015A for ; Tue, 8 Mar 2016 13:20:36 +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 8AA1E20125 for ; Tue, 8 Mar 2016 13:20:35 +0000 (UTC) Received: from localhost ([::1]:34576 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adHYw-00035j-Oe for patchwork-qemu-devel@patchwork.kernel.org; Tue, 08 Mar 2016 08:20:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adHX5-0000Bs-6p for qemu-devel@nongnu.org; Tue, 08 Mar 2016 08:18:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adHWy-0004Ah-SX for qemu-devel@nongnu.org; Tue, 08 Mar 2016 08:18:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58998) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adHWy-0004Ad-I6; Tue, 08 Mar 2016 08:18:32 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 1CDB57733E; Tue, 8 Mar 2016 13:18:32 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u28DII0K004417; Tue, 8 Mar 2016 08:18:27 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 8 Mar 2016 14:18:12 +0100 Message-Id: <1457443095-213125-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1457443095-213125-1-git-send-email-imammedo@redhat.com> References: <1457443095-213125-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: mjrosato@linux.vnet.ibm.com, thuth@redhat.com, pkrempa@redhat.com, ehabkost@redhat.com, aik@ozlabs.ru, armbru@redhat.com, agraf@suse.de, borntraeger@de.ibm.com, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, pbonzini@redhat.com, mdroth@linux.vnet.ibm.com, afaerber@suse.de, david@gibson.dropbear.id.au Subject: [Qemu-devel] [PATCH v2 2/5] spapr: convert slot name property to numeric core and links 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 it's just a hack to get qiuck swith to numeric core id should be split and merged in patches introducing modified code. Signed-off-by: Igor Mammedov --- hw/cpu/core.c | 32 +++++++++++++++++++++++--------- hw/ppc/spapr.c | 39 ++------------------------------------- hw/ppc/spapr_cpu_core.c | 25 ++----------------------- include/hw/cpu/core.h | 4 ++-- 4 files changed, 29 insertions(+), 71 deletions(-) diff --git a/hw/cpu/core.c b/hw/cpu/core.c index d8caf37..90a9408 100644 --- a/hw/cpu/core.c +++ b/hw/cpu/core.c @@ -7,25 +7,39 @@ * See the COPYING file in the top-level directory. */ #include "hw/cpu/core.h" +#include "qapi/visitor.h" -static char *core_prop_get_slot(Object *obj, Error **errp) +static void core_prop_get_core(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) { - CPUCore *core = CPU_CORE(obj); + CPUCore *cc = CPU_CORE(obj); + int64_t value = cc->core; - return g_strdup(core->slot); + visit_type_int(v, name, &value, errp); } -static void core_prop_set_slot(Object *obj, const char *val, Error **errp) +static void core_prop_set_core(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) { - CPUCore *core = CPU_CORE(obj); - - core->slot = g_strdup(val); + CPUCore *cc = CPU_CORE(obj); + Error *local_err = NULL; + int64_t value; + + visit_type_int(v, name, &value, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + cc->core = value; } static void cpu_core_instance_init(Object *obj) { - object_property_add_str(obj, "slot", core_prop_get_slot, core_prop_set_slot, - NULL); + object_property_add(obj, CPU_CORE_ID_PROP, "int", + core_prop_get_core, core_prop_set_core, + NULL, NULL, NULL); } static const TypeInfo cpu_core_type_info = { diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 6173c1b..6890a44 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1755,28 +1755,6 @@ static void spapr_validate_node_memory(MachineState *machine, Error **errp) } } -/* - * Check to see if core is being hot-plugged into an already populated slot. - */ -static void spapr_cpu_core_allow_set_link(Object *obj, const char *name, - Object *val, Error **errp) -{ - Object *core = object_property_get_link(qdev_get_machine(), name, NULL); - - /* - * Allow the link to be unset when the core is unplugged. - */ - if (!val) { - return; - } - - if (core) { - char *path = object_get_canonical_path(core); - error_setg(errp, "Slot %s already populated with %s", name, path); - g_free(path); - } -} - /* pSeries LPAR / sPAPR hardware init */ static void ppc_spapr_init(MachineState *machine) { @@ -1884,21 +1862,8 @@ static void ppc_spapr_init(MachineState *machine) spapr->cores = g_new0(Object *, spapr_max_cores); for (i = 0; i < spapr_max_cores; i++) { - char name[32]; - - /* - * Create links from machine objects to all possible cores. - */ - snprintf(name, sizeof(name), "%s[%d]", SPAPR_MACHINE_CPU_CORE_PROP, i); - object_property_add_link(OBJECT(spapr), name, TYPE_SPAPR_CPU_CORE, - (Object **)&spapr->cores[i], - spapr_cpu_core_allow_set_link, - OBJ_PROP_LINK_UNREF_ON_RELEASE, - &error_fatal); - /* - * Create cores and set link from machine object to core object for - * boot time CPUs and realize them. + * Create cores for boot time CPUs and realize them. */ if (i < spapr_cores) { Object *core = object_new(TYPE_SPAPR_CPU_CORE); @@ -1907,7 +1872,7 @@ static void ppc_spapr_init(MachineState *machine) &error_fatal); object_property_set_int(core, smp_threads, "nr_threads", &error_fatal); - object_property_set_str(core, name, CPU_CORE_SLOT_PROP, + object_property_set_int(core, i, CPU_CORE_ID_PROP, &error_fatal); object_property_set_bool(core, true, "realized", &error_fatal); } diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 5156eb3..98af840 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -117,19 +117,12 @@ static int spapr_cpu_release(Object *obj, void *opaque) static void spapr_core_release(DeviceState *dev, void *opaque) { struct sPAPRCPUUnplugList unplug_list; - sPAPRMachineState *spapr = SPAPR_MACHINE(qdev_get_machine()); sPAPRCPUCore *core = SPAPR_CPU_CORE(OBJECT(dev)); - char *slot = object_property_get_str(OBJECT(dev), CPU_CORE_SLOT_PROP, - &error_fatal); QLIST_INIT(&unplug_list); object_child_foreach(OBJECT(dev), spapr_cpu_release, &unplug_list); spapr_cpu_core_cleanup(&unplug_list); - /* Unset the link from machine object to this core */ - object_property_set_link(OBJECT(spapr), NULL, slot, NULL); - g_free(slot); - g_free(core->threads); object_unparent(OBJECT(dev)); } @@ -181,9 +174,6 @@ static int spapr_cpu_core_realize_child(Object *child, void *opaque) static void spapr_cpu_core_realize(DeviceState *dev, Error **errp) { sPAPRCPUCore *core = SPAPR_CPU_CORE(OBJECT(dev)); - sPAPRMachineState *spapr = SPAPR_MACHINE(qdev_get_machine()); - char *slot; - Error *local_err = NULL; if (!core->nr_threads) { error_setg(errp, "nr_threads property can't be 0"); @@ -199,19 +189,8 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp) * TODO: If slot isn't specified, plug this core into * an existing empty slot. */ - slot = object_property_get_str(OBJECT(dev), CPU_CORE_SLOT_PROP, &local_err); - if (!slot) { - error_setg(errp, "slot property isn't set"); - return; - } - - object_property_set_link(OBJECT(spapr), OBJECT(core), slot, &local_err); - g_free(slot); - if (local_err) { - error_propagate(errp, local_err); - return; - } - + /* probably should error out as 'core' should be specified + either by board or by user */ object_child_foreach(OBJECT(dev), spapr_cpu_core_realize_child, errp); } diff --git a/include/hw/cpu/core.h b/include/hw/cpu/core.h index 2daa724..a627969 100644 --- a/include/hw/cpu/core.h +++ b/include/hw/cpu/core.h @@ -22,9 +22,9 @@ typedef struct CPUCore { DeviceState parent_obj; /*< public >*/ - char *slot; + int core; } CPUCore; -#define CPU_CORE_SLOT_PROP "slot" +#define CPU_CORE_ID_PROP "core" #endif