From nobody Sat Apr 27 15:17:23 2024 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506332950981156.68202933973316; Mon, 25 Sep 2017 02:49:10 -0700 (PDT) Received: from localhost ([::1]:41523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwQ0U-0000q9-Jc for importer@patchew.org; Mon, 25 Sep 2017 05:48:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwPzR-0000QR-C1 for qemu-devel@nongnu.org; Mon, 25 Sep 2017 05:47:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwPzM-0004Ay-Eh for qemu-devel@nongnu.org; Mon, 25 Sep 2017 05:47:47 -0400 Received: from 6.mo173.mail-out.ovh.net ([46.105.43.93]:53331) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dwPzM-0004A5-7o for qemu-devel@nongnu.org; Mon, 25 Sep 2017 05:47:44 -0400 Received: from player687.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo173.mail-out.ovh.net (Postfix) with ESMTP id 1C1907798C for ; Mon, 25 Sep 2017 11:47:40 +0200 (CEST) Received: from bahia.lan (gar31-1-82-66-74-139.fbx.proxad.net [82.66.74.139]) (Authenticated sender: groug@kaod.org) by player687.ha.ovh.net (Postfix) with ESMTPA id 185A72C0093; Mon, 25 Sep 2017 11:47:34 +0200 (CEST) From: Greg Kurz To: qemu-ppc@nongnu.org Date: Mon, 25 Sep 2017 11:47:33 +0200 Message-ID: <150633285374.14880.11614678065344980502.stgit@bahia.lan> User-Agent: StGit/0.17.1-46-g6855-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Ovh-Tracer-Id: 15040333909645760801 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelledrjedtgddvudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.43.93 Subject: [Qemu-devel] [PATCH] spapr: move registration of "host" CPU core type to machine code 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: Bharata B Rao , qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 The CPU core abstraction belongs to the machine code. This also gets rid of some code duplication. Signed-off-by: Greg Kurz --- hw/ppc/spapr_cpu_core.h is also included elsewhere in target/ppc/kvm.c but this is already handled by the following cleanup patch: https://patchwork.ozlabs.org/patch/817598/ --- hw/ppc/spapr.c | 4 ++++ hw/ppc/spapr_cpu_core.c | 34 ++++++++++++++++++++++------------ include/hw/ppc/spapr_cpu_core.h | 2 +- target/ppc/kvm.c | 12 ------------ 4 files changed, 27 insertions(+), 25 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 0ce3ec87ac59..e82c8532ffb0 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2349,6 +2349,10 @@ static void ppc_spapr_init(MachineState *machine) } =20 /* init CPUs */ + if (kvm_enabled()) { + spapr_cpu_core_register_host_type(); + } + if (machine->cpu_model =3D=3D NULL) { machine->cpu_model =3D kvm_enabled() ? "host" : smc->tcg_default_c= pu; } diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index c08ee7571a50..6e224ba029ec 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -317,7 +317,7 @@ static Property spapr_cpu_core_properties[] =3D { DEFINE_PROP_END_OF_LIST() }; =20 -void spapr_cpu_core_class_init(ObjectClass *oc, void *data) +static void spapr_cpu_core_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); sPAPRCPUCoreClass *scc =3D SPAPR_CPU_CORE_CLASS(oc); @@ -337,6 +337,20 @@ static const TypeInfo spapr_cpu_core_type_info =3D { .class_size =3D sizeof(sPAPRCPUCoreClass), }; =20 +static void spapr_cpu_core_register_type(const char *model_name) +{ + TypeInfo type_info =3D { + .parent =3D TYPE_SPAPR_CPU_CORE, + .instance_size =3D sizeof(sPAPRCPUCore), + .class_init =3D spapr_cpu_core_class_init, + .class_data =3D (void *) model_name, + }; + + type_info.name =3D g_strdup_printf("%s-"TYPE_SPAPR_CPU_CORE, model_nam= e); + type_register(&type_info); + g_free((void *)type_info.name); +} + static void spapr_cpu_core_register_types(void) { int i; @@ -344,18 +358,14 @@ static void spapr_cpu_core_register_types(void) type_register_static(&spapr_cpu_core_type_info); =20 for (i =3D 0; i < ARRAY_SIZE(spapr_core_models); i++) { - TypeInfo type_info =3D { - .parent =3D TYPE_SPAPR_CPU_CORE, - .instance_size =3D sizeof(sPAPRCPUCore), - .class_init =3D spapr_cpu_core_class_init, - .class_data =3D (void *) spapr_core_models[i], - }; - - type_info.name =3D g_strdup_printf("%s-" TYPE_SPAPR_CPU_CORE, - spapr_core_models[i]); - type_register(&type_info); - g_free((void *)type_info.name); + spapr_cpu_core_register_type(spapr_core_models[i]); } + +} + +void spapr_cpu_core_register_host_type(void) +{ + spapr_cpu_core_register_type("host"); } =20 type_init(spapr_cpu_core_register_types) diff --git a/include/hw/ppc/spapr_cpu_core.h b/include/hw/ppc/spapr_cpu_cor= e.h index 93051e9ecf56..e3e906343048 100644 --- a/include/hw/ppc/spapr_cpu_core.h +++ b/include/hw/ppc/spapr_cpu_core.h @@ -36,5 +36,5 @@ typedef struct sPAPRCPUCoreClass { } sPAPRCPUCoreClass; =20 char *spapr_get_cpu_core_type(const char *model); -void spapr_cpu_core_class_init(ObjectClass *oc, void *data); +void spapr_cpu_core_register_host_type(void); #endif diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 5b281b2f1b6d..8dd80993ec9e 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -37,7 +37,6 @@ #include "hw/sysbus.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" -#include "hw/ppc/spapr_cpu_core.h" #include "hw/ppc/ppc.h" #include "sysemu/watchdog.h" #include "trace.h" @@ -2502,17 +2501,6 @@ static int kvm_ppc_register_host_cpu_type(void) oc =3D object_class_by_name(type_info.name); g_assert(oc); =20 -#if defined(TARGET_PPC64) - type_info.name =3D g_strdup_printf("%s-"TYPE_SPAPR_CPU_CORE, "host"); - type_info.parent =3D TYPE_SPAPR_CPU_CORE, - 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_register(&type_info); - g_free((void *)type_info.name); -#endif - /* * Update generic CPU family class alias (e.g. on a POWER8NVL host, * we want "POWER8" to be a "family" alias that points to the current