From nobody Wed Feb 11 02:54:53 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508214908551785.3376836343243; Mon, 16 Oct 2017 21:35:08 -0700 (PDT) Received: from localhost ([::1]:36398 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Jao-000295-Lb for importer@patchew.org; Tue, 17 Oct 2017 00:35:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4JOZ-0008MZ-4p for qemu-devel@nongnu.org; Tue, 17 Oct 2017 00:22:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4JOW-000732-LR for qemu-devel@nongnu.org; Tue, 17 Oct 2017 00:22:23 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:37227) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4JOW-0006wJ-4Z; Tue, 17 Oct 2017 00:22:20 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3yGMTv33W7z9t3x; Tue, 17 Oct 2017 15:22:10 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1508214131; bh=108rx0dFaMmTJaBnfQHymcoSn+N73siHzpERzPmotCM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rfs1K1GA/+jrTKl4HlO2T/WQgiXRIoDDOtpb0DxMFJhiKS4yVRiQsSTsKiadFyBev joo0Ij2d6Htq7c3zDdEsPL1SBa+3kZ6r9MXSpfL5gZ5iPc6OzLfEQNhQcpf77ywGKF hHm+LrZXEAYDI+y8YhCmEZvl8u0syiNPOT9gIQ2E= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 17 Oct 2017 15:21:39 +1100 Message-Id: <20171017042152.29443-22-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> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 21/34] 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: 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-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Igor Mammedov 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 Signed-off-by: David Gibson --- hw/ppc/spapr.c | 6 ++---- hw/ppc/spapr_cpu_core.c | 14 ++++++-------- include/hw/ppc/spapr_cpu_core.h | 2 +- target/ppc/kvm.c | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 112dd91348..2c32f33314 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3161,8 +3161,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++) { @@ -3258,8 +3257,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 550d320b5b..9810697221 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; Error *local_err =3D NULL; void *obj; int i, j; @@ -164,6 +162,7 @@ static void spapr_cpu_core_realize(DeviceState *dev, Er= ror **errp) return; } =20 + size =3D object_type_get_instance_size(scc->cpu_type); sc->threads =3D g_malloc0(size * cc->nr_threads); for (i =3D 0; i < cc->nr_threads; i++) { char id[32]; @@ -172,7 +171,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 +229,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/include/hw/ppc/spapr_cpu_core.h b/include/hw/ppc/spapr_cpu_cor= e.h index 66dcf52587..264ce68785 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/target/ppc/kvm.c b/target/ppc/kvm.c index 171d3d8040..c2152ed52c 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.13.6