From nobody Wed Feb 11 02:54:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508215409877762.7944556988638; Mon, 16 Oct 2017 21:43:29 -0700 (PDT) Received: from localhost ([::1]:36445 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Jix-0001N7-4C for importer@patchew.org; Tue, 17 Oct 2017 00:43:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4JOc-0008Rj-Te for qemu-devel@nongnu.org; Tue, 17 Oct 2017 00:22:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4JOY-00077J-Lm for qemu-devel@nongnu.org; Tue, 17 Oct 2017 00:22:26 -0400 Received: from ozlabs.org ([103.22.144.67]:55931) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4JOY-00073H-9l; Tue, 17 Oct 2017 00:22:22 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3yGMTw20f9z9t3l; Tue, 17 Oct 2017 15:22:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1508214132; bh=QLiyl/0BNgXK1ceu/KCX69cat+nq4diV9fayOiV7wnc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zd9wIDSZjEtXDDKHQ87QpjZmEiC3i4f9GhYxPlQYmeBMyqgthdM7MJg5SyemsbzNr TuekfIkaDMhET5JeYRn6ugB9Ys97gs4yYV4prxJGz1qsNHzZBSjuxpflikWHW+2ZEL s50nFFURefTySIIOaYjVA54uiYgn1OiBgq3vK4/o= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 17 Oct 2017 15:21:46 +1100 Message-Id: <20171017042152.29443-29-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171017042152.29443-1-david@gibson.dropbear.id.au> References: <20171017042152.29443-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 28/34] ppc: pnv: drop PnvCoreClass::cpu_oc field X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: agraf@suse.de, ehabkost@redhat.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, imammedo@redhat.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Igor Mammedov deduce cpu type directly from core type instead of maintaining type mapping in PnvCoreClass::cpu_oc and doing extra cpu_model parsing in pnv_core_class_init() Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: David Gibson --- hw/ppc/pnv_core.c | 18 ++++++++++++------ include/hw/ppc/pnv_core.h | 1 - 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c index 85b39a5b5e..135d3fa29f 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.c @@ -27,6 +27,16 @@ #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/xics.h" =20 +static const char *pnv_core_cpu_typename(PnvCore *pc) +{ + const char *core_type =3D object_class_get_name(object_get_class(OBJEC= T(pc))); + int len =3D strlen(core_type) - strlen(PNV_CORE_TYPE_SUFFIX); + char *s =3D g_strdup_printf(POWERPC_CPU_TYPE_NAME("%.*s"), len, core_t= ype); + const char *cpu_type =3D object_class_get_name(object_class_by_name(s)= ); + g_free(s); + return cpu_type; +} + static void powernv_cpu_reset(void *opaque) { PowerPCCPU *cpu =3D opaque; @@ -148,8 +158,7 @@ static void pnv_core_realize(DeviceState *dev, Error **= errp) { PnvCore *pc =3D PNV_CORE(OBJECT(dev)); CPUCore *cc =3D CPU_CORE(OBJECT(dev)); - PnvCoreClass *pcc =3D PNV_CORE_GET_CLASS(OBJECT(dev)); - const char *typename =3D object_class_get_name(pcc->cpu_oc); + const char *typename =3D pnv_core_cpu_typename(pc); size_t size =3D object_type_get_instance_size(typename); Error *local_err =3D NULL; void *obj; @@ -211,11 +220,9 @@ static Property pnv_core_properties[] =3D { static void pnv_core_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); - PnvCoreClass *pcc =3D PNV_CORE_CLASS(oc); =20 dc->realize =3D pnv_core_realize; dc->props =3D pnv_core_properties; - pcc->cpu_oc =3D cpu_class_by_name(TYPE_POWERPC_CPU, data); } =20 static const TypeInfo pnv_core_info =3D { @@ -223,6 +230,7 @@ static const TypeInfo pnv_core_info =3D { .parent =3D TYPE_CPU_CORE, .instance_size =3D sizeof(PnvCore), .class_size =3D sizeof(PnvCoreClass), + .class_init =3D pnv_core_class_init, .abstract =3D true, }; =20 @@ -239,8 +247,6 @@ static void pnv_core_register_types(void) TypeInfo ti =3D { .parent =3D TYPE_PNV_CORE, .instance_size =3D sizeof(PnvCore), - .class_init =3D pnv_core_class_init, - .class_data =3D (void *) pnv_core_models[i], }; ti.name =3D pnv_core_typename(pnv_core_models[i]); type_register(&ti); diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h index 3360c4b12d..a336a1f18a 100644 --- a/include/hw/ppc/pnv_core.h +++ b/include/hw/ppc/pnv_core.h @@ -42,7 +42,6 @@ typedef struct PnvCore { =20 typedef struct PnvCoreClass { DeviceClass parent_class; - ObjectClass *cpu_oc; } PnvCoreClass; =20 #define PNV_CORE_TYPE_SUFFIX "-" TYPE_PNV_CORE --=20 2.13.6