From nobody Tue Feb 10 12:57:48 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507579846995979.5565719817778; Mon, 9 Oct 2017 13:10:46 -0700 (PDT) Received: from localhost ([::1]:59632 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1eNg-0001P3-Uj for importer@patchew.org; Mon, 09 Oct 2017 16:10:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1e5T-0003TQ-5d for qemu-devel@nongnu.org; Mon, 09 Oct 2017 15:51:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1e5S-0006Zl-5c for qemu-devel@nongnu.org; Mon, 09 Oct 2017 15:51:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42554) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1e5R-0006ZA-Rd; Mon, 09 Oct 2017 15:51:38 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CFF395D689; Mon, 9 Oct 2017 19:51:36 +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 smtp.corp.redhat.com (Postfix) with ESMTP id 8515560604; Mon, 9 Oct 2017 19:51:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CFF395D689 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=imammedo@redhat.com From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 9 Oct 2017 21:51:01 +0200 Message-Id: <1507578671-158758-15-git-send-email-imammedo@redhat.com> In-Reply-To: <1507578671-158758-1-git-send-email-imammedo@redhat.com> References: <1507578671-158758-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 09 Oct 2017 19:51:37 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 14/24] ppc: spapr: use cpu type name directly 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: "open list:ppce500" , "Edgar E. Iglesias" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Alexander Graf , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" replace sPAPRCPUCoreClass::cpu_class with cpu type name since it were needed just to get that at points it were accessed. Signed-off-by: Igor Mammedov Reviewed-by: Greg Kurz Acked-by: David Gibson --- include/hw/ppc/spapr_cpu_core.h | 2 +- hw/ppc/spapr.c | 6 ++---- hw/ppc/spapr_cpu_core.c | 13 +++++-------- target/ppc/kvm.c | 2 +- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/include/hw/ppc/spapr_cpu_core.h b/include/hw/ppc/spapr_cpu_cor= e.h index 66dcf52..264ce68 100644 --- a/include/hw/ppc/spapr_cpu_core.h +++ b/include/hw/ppc/spapr_cpu_core.h @@ -34,7 +34,7 @@ typedef struct sPAPRCPUCore { =20 typedef struct sPAPRCPUCoreClass { DeviceClass parent_class; - ObjectClass *cpu_class; + const char *cpu_type; } sPAPRCPUCoreClass; =20 char *spapr_get_cpu_core_type(const char *model); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c7a0310..fda2bbe 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3149,8 +3149,7 @@ void spapr_core_release(DeviceState *dev) if (smc->pre_2_10_has_unused_icps) { sPAPRCPUCore *sc =3D SPAPR_CPU_CORE(OBJECT(dev)); sPAPRCPUCoreClass *scc =3D SPAPR_CPU_CORE_GET_CLASS(OBJECT(cc)); - const char *typename =3D object_class_get_name(scc->cpu_class); - size_t size =3D object_type_get_instance_size(typename); + size_t size =3D object_type_get_instance_size(scc->cpu_type); int i; =20 for (i =3D 0; i < cc->nr_threads; i++) { @@ -3246,8 +3245,7 @@ static void spapr_core_plug(HotplugHandler *hotplug_d= ev, DeviceState *dev, =20 if (smc->pre_2_10_has_unused_icps) { sPAPRCPUCoreClass *scc =3D SPAPR_CPU_CORE_GET_CLASS(OBJECT(cc)); - const char *typename =3D object_class_get_name(scc->cpu_class); - size_t size =3D object_type_get_instance_size(typename); + size_t size =3D object_type_get_instance_size(scc->cpu_type); int i; =20 for (i =3D 0; i < cc->nr_threads; i++) { diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 550d320..a008056 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -90,8 +90,7 @@ static void spapr_cpu_core_unrealizefn(DeviceState *dev, = Error **errp) { sPAPRCPUCore *sc =3D SPAPR_CPU_CORE(OBJECT(dev)); sPAPRCPUCoreClass *scc =3D SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev)); - const char *typename =3D object_class_get_name(scc->cpu_class); - size_t size =3D object_type_get_instance_size(typename); + size_t size =3D object_type_get_instance_size(scc->cpu_type); CPUCore *cc =3D CPU_CORE(dev); int i; =20 @@ -152,8 +151,7 @@ static void spapr_cpu_core_realize(DeviceState *dev, Er= ror **errp) sPAPRCPUCore *sc =3D SPAPR_CPU_CORE(OBJECT(dev)); sPAPRCPUCoreClass *scc =3D SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev)); CPUCore *cc =3D CPU_CORE(OBJECT(dev)); - const char *typename =3D object_class_get_name(scc->cpu_class); - size_t size =3D object_type_get_instance_size(typename); + size_t size =3D object_type_get_instance_size(scc->cpu_type); Error *local_err =3D NULL; void *obj; int i, j; @@ -172,7 +170,7 @@ static void spapr_cpu_core_realize(DeviceState *dev, Er= ror **errp) =20 obj =3D sc->threads + i * size; =20 - object_initialize(obj, size, typename); + object_initialize(obj, size, scc->cpu_type); cs =3D CPU(obj); cpu =3D POWERPC_CPU(cs); cs->cpu_index =3D cc->core_id + i; @@ -230,14 +228,13 @@ void spapr_cpu_core_class_init(ObjectClass *oc, void = *data) dc->realize =3D spapr_cpu_core_realize; dc->unrealize =3D spapr_cpu_core_unrealizefn; dc->props =3D spapr_cpu_core_properties; - scc->cpu_class =3D cpu_class_by_name(TYPE_POWERPC_CPU, data); - g_assert(scc->cpu_class); + scc->cpu_type =3D data; } =20 #define DEFINE_SPAPR_CPU_CORE_TYPE(cpu_model) \ { \ .parent =3D TYPE_SPAPR_CPU_CORE, \ - .class_data =3D (void *) cpu_model, \ + .class_data =3D (void *) POWERPC_CPU_TYPE_NAME(cpu_model), \ .class_init =3D spapr_cpu_core_class_init, \ .name =3D SPAPR_CPU_CORE_TYPE_NAME(cpu_model), \ } diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 171d3d8..c2152ed 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2514,7 +2514,7 @@ static int kvm_ppc_register_host_cpu_type(void) type_info.instance_size =3D sizeof(sPAPRCPUCore); type_info.instance_init =3D NULL; type_info.class_init =3D spapr_cpu_core_class_init; - type_info.class_data =3D (void *) "host"; + type_info.class_data =3D (void *) POWERPC_CPU_TYPE_NAME("host"); type_register(&type_info); g_free((void *)type_info.name); #endif --=20 2.7.4