From nobody Sun Feb 8 21:47:25 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; 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 1503563040309509.8581018471466; Thu, 24 Aug 2017 01:24:00 -0700 (PDT) Received: from localhost ([::1]:47186 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dknQj-0000tp-5V for importer@patchew.org; Thu, 24 Aug 2017 04:23:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dknOo-0008EI-Dl for qemu-devel@nongnu.org; Thu, 24 Aug 2017 04:22:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dknOm-0006gp-Lv for qemu-devel@nongnu.org; Thu, 24 Aug 2017 04:21:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55850) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dknOm-0006gi-CS; Thu, 24 Aug 2017 04:21:56 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 503924E4D3; Thu, 24 Aug 2017 08:21:55 +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 52D2F69AFD; Thu, 24 Aug 2017 08:21:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 503924E4D3 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=imammedo@redhat.com From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 24 Aug 2017 10:21:46 +0200 Message-Id: <1503562911-2776-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1503562911-2776-1-git-send-email-imammedo@redhat.com> References: <1503562911-2776-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 24 Aug 2017 08:21:55 +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 for-2.11 1/6] ppc: use macros to make cpu type name from string literal 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: qemu-ppc@nongnu.org, Alexander Graf , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Replace "-" TYPE_POWERPC_CPU when composing cpu type name from cpu model string literal and the same pattern in format strings with POWERPC_CPU_TYPE_SUFFIX and POWERPC_CPU_TYPE_NAME(model) macroses like we do in x86. Later POWERPC_CPU_TYPE_NAME() will be used to define default cpu type per machine type and as bonus it will be consistent and easy grep-able pattern across all other targets that I'm plannig to treat the same way. Signed-off-by: Igor Mammedov Reviewed-by: David Gibson --- target/ppc/cpu.h | 3 +++ target/ppc/kvm_ppc.h | 2 +- target/ppc/cpu-models.c | 2 +- target/ppc/kvm.c | 2 +- target/ppc/translate_init.c | 6 +++--- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 12f0949..0512393 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1354,6 +1354,9 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, uint= 32_t val); =20 #define cpu_init(cpu_model) cpu_generic_init(TYPE_POWERPC_CPU, cpu_model) =20 +#define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU +#define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX + #define cpu_signal_handler cpu_ppc_signal_handler #define cpu_list ppc_cpu_list =20 diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index 6bc6fb3..bcb40f2 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -9,7 +9,7 @@ #ifndef KVM_PPC_H #define KVM_PPC_H =20 -#define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU +#define TYPE_HOST_POWERPC_CPU POWERPC_CPU_TYPE_NAME("host") =20 #ifdef CONFIG_KVM =20 diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c index 4d3e635..8b27962 100644 --- a/target/ppc/cpu-models.c +++ b/target/ppc/cpu-models.c @@ -51,7 +51,7 @@ = \ static const TypeInfo = \ glue(POWERPC_DEF_PREFIX(_pvr, _svr, _type), _cpu_type_info) =3D { = \ - .name =3D _name "-" TYPE_POWERPC_CPU, = \ + .name =3D POWERPC_CPU_TYPE_NAME(_name), = \ .parent =3D stringify(_type) "-family-" TYPE_POWERPC_CPU, = \ .class_init =3D = \ glue(POWERPC_DEF_PREFIX(_pvr, _svr, _type), _cpu_class_init), = \ diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 8571379..8590809 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2484,7 +2484,7 @@ static int kvm_ppc_register_host_cpu_type(void) char *suffix; =20 ppc_cpu_aliases[i].model =3D g_strdup(object_class_get_name(oc= )); - suffix =3D strstr(ppc_cpu_aliases[i].model, "-"TYPE_POWERPC_CP= U); + suffix =3D strstr(ppc_cpu_aliases[i].model, POWERPC_CPU_TYPE_S= UFFIX); if (suffix) { *suffix =3D 0; } diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index 43be9a8..f377cf2 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -10185,7 +10185,7 @@ static gint ppc_cpu_compare_class_name(gconstpointe= r a, gconstpointer b) if (strncasecmp(name, object_class_get_name(oc), strlen(name)) =3D=3D = 0 && ppc_cpu_is_valid(pcc) && strcmp(object_class_get_name(oc) + strlen(name), - "-" TYPE_POWERPC_CPU) =3D=3D 0) { + POWERPC_CPU_TYPE_SUFFIX) =3D=3D 0) { return 0; } return -1; @@ -10327,7 +10327,7 @@ static void ppc_cpu_list_entry(gpointer data, gpoin= ter user_data) } =20 name =3D g_strndup(typename, - strlen(typename) - strlen("-" TYPE_POWERPC_CPU)); + strlen(typename) - strlen(POWERPC_CPU_TYPE_SUFFIX)); (*s->cpu_fprintf)(s->file, "PowerPC %-16s PVR %08x\n", name, pcc->pvr); for (i =3D 0; ppc_cpu_aliases[i].alias !=3D NULL; i++) { @@ -10388,7 +10388,7 @@ static void ppc_cpu_defs_entry(gpointer data, gpoin= ter user_data) typename =3D object_class_get_name(oc); info =3D g_malloc0(sizeof(*info)); info->name =3D g_strndup(typename, - strlen(typename) - strlen("-" TYPE_POWERPC_CPU)= ); + strlen(typename) - strlen(POWERPC_CPU_TYPE_SUFF= IX)); =20 entry =3D g_malloc0(sizeof(*entry)); entry->value =3D info; --=20 2.7.4