From nobody Wed Feb 11 02:54:44 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 1508214744676567.1813395287015; Mon, 16 Oct 2017 21:32:24 -0700 (PDT) Received: from localhost ([::1]:36390 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4JYF-0008In-Ti for importer@patchew.org; Tue, 17 Oct 2017 00:32:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50595) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4JOZ-0008MW-0h 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-00072k-FU for qemu-devel@nongnu.org; Tue, 17 Oct 2017 00:22:22 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:44049) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4JOW-0006vz-19; Tue, 17 Oct 2017 00:22:20 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3yGMTt6t2zz9t2c; 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=1508214130; bh=SKNLLg1sb+CEpHzP05W2puSZSY28Ac9SKzN57mQVOS0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GVQpyTGrvpmc4/FfnwDIZFYBm1IG/43NP4pTRF2isW+JqfIrHTKRIDkCpqfmpIfEI qUHgz4bhH7xaGuoTk3MhHIubSNgAeqSNEwFGrqW7FFhvnvRNMqH1JG8MAfPhUv4yxk 8rWsnTvXzM+mRsJ5ZuHw4Wp2TszRFLnEv2FEDvm8= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 17 Oct 2017 15:21:40 +1100 Message-Id: <20171017042152.29443-23-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 22/34] ppc: spapr: register 'host' core type along with the rest of core types 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 consolidate 'host' core type registration by moving it from KVM specific code into spapr_cpu_core.c, similar like it's done in x86 target. Signed-off-by: Igor Mammedov Reviewed-by: Greg Kurz Acked-by: David Gibson Signed-off-by: David Gibson --- hw/ppc/spapr_cpu_core.c | 5 ++++- include/hw/ppc/spapr_cpu_core.h | 1 - target/ppc/kvm.c | 11 ----------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 9810697221..7dbf9c31c5 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -221,7 +221,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); @@ -259,6 +259,9 @@ static const TypeInfo spapr_cpu_core_type_infos[] =3D { DEFINE_SPAPR_CPU_CORE_TYPE("power8nvl_v1.0"), DEFINE_SPAPR_CPU_CORE_TYPE("power9_v1.0"), DEFINE_SPAPR_CPU_CORE_TYPE("power9_v2.0"), +#ifdef CONFIG_KVM + DEFINE_SPAPR_CPU_CORE_TYPE("host"), +#endif }; =20 DEFINE_TYPES(spapr_cpu_core_type_infos) diff --git a/include/hw/ppc/spapr_cpu_core.h b/include/hw/ppc/spapr_cpu_cor= e.h index 264ce68785..42765de392 100644 --- a/include/hw/ppc/spapr_cpu_core.h +++ b/include/hw/ppc/spapr_cpu_core.h @@ -38,5 +38,4 @@ typedef struct sPAPRCPUCoreClass { } sPAPRCPUCoreClass; =20 char *spapr_get_cpu_core_type(const char *model); -void spapr_cpu_core_class_init(ObjectClass *oc, void *data); #endif diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index c2152ed52c..cb5777afa0 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2508,17 +2508,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 *) POWERPC_CPU_TYPE_NAME("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 --=20 2.13.6