{"id":807628,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807628/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<1504099475-241036-3-git-send-email-imammedo@redhat.com>","date":"2017-08-30T13:24:29","name":"[v2,2/8] ppc: use macros to make cpu type name from string literal","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5f464e75aa57c55d516bbde22ab24c1d08fbea46","submitter":{"id":11305,"url":"http://patchwork.ozlabs.org/api/1.0/people/11305/?format=json","name":"Igor Mammedov","email":"imammedo@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504099475-241036-3-git-send-email-imammedo@redhat.com/mbox/","series":[{"id":612,"url":"http://patchwork.ozlabs.org/api/1.0/series/612/?format=json","date":"2017-08-30T13:24:29","name":"ppc: cpu_model handling cleanups","version":2,"mbox":"http://patchwork.ozlabs.org/series/612/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807628/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=imammedo@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xj5px3Nllz9sN7\n\tfor ;\n\tWed, 30 Aug 2017 23:25:29 +1000 (AEST)","from localhost ([::1]:50562 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn2zn-0001oy-5s\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 09:25:27 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:50916)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn2z5-0001of-I1\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 09:24:47 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn2z3-0003W0-KX\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 09:24:43 -0400","from mx1.redhat.com ([209.132.183.28]:36232)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dn2z3-0003VZ-Bc; Wed, 30 Aug 2017 09:24:41 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 503B961980;\n\tWed, 30 Aug 2017 13:24:40 +0000 (UTC)","from dell-r430-03.lab.eng.brq.redhat.com\n\t(dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 502F19B518;\n\tWed, 30 Aug 2017 13:24:39 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 503B961980","From":"Igor Mammedov ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 15:24:29 +0200","Message-Id":"<1504099475-241036-3-git-send-email-imammedo@redhat.com>","In-Reply-To":"<1504099475-241036-1-git-send-email-imammedo@redhat.com>","References":"<1504099475-241036-1-git-send-email-imammedo@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tWed, 30 Aug 2017 13:24:40 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v2 2/8] ppc: use macros to make cpu type name\n\tfrom string literal","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"qemu-ppc@nongnu.org, Alexander Graf ,\n\tDavid Gibson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Replace\n \"-\" TYPE_POWERPC_CPU\nwhen composing cpu type name from cpu model string literal\nand the same pattern in format strings with\n POWERPC_CPU_TYPE_SUFFIX and POWERPC_CPU_TYPE_NAME(model)\nmacroses like we do in x86.\n\nLater POWERPC_CPU_TYPE_NAME() will be used to define default\ncpu type per machine type and as bonus it will be consistent\nand easy grep-able pattern across all other targets that I'm\nplannig to treat the same way.\n\nSigned-off-by: Igor Mammedov \nReviewed-by: David Gibson \n---\n target/ppc/cpu.h | 3 +++\n target/ppc/kvm_ppc.h | 2 +-\n target/ppc/cpu-models.c | 2 +-\n target/ppc/kvm.c | 2 +-\n target/ppc/translate_init.c | 6 +++---\n 5 files changed, 9 insertions(+), 6 deletions(-)","diff":"diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h\nindex 12f0949..0512393 100644\n--- a/target/ppc/cpu.h\n+++ b/target/ppc/cpu.h\n@@ -1354,6 +1354,9 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, uint32_t val);\n \n #define cpu_init(cpu_model) cpu_generic_init(TYPE_POWERPC_CPU, cpu_model)\n \n+#define POWERPC_CPU_TYPE_SUFFIX \"-\" TYPE_POWERPC_CPU\n+#define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX\n+\n #define cpu_signal_handler cpu_ppc_signal_handler\n #define cpu_list ppc_cpu_list\n \ndiff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h\nindex 381afe6..f5d7397 100644\n--- a/target/ppc/kvm_ppc.h\n+++ b/target/ppc/kvm_ppc.h\n@@ -9,7 +9,7 @@\n #ifndef KVM_PPC_H\n #define KVM_PPC_H\n \n-#define TYPE_HOST_POWERPC_CPU \"host-\" TYPE_POWERPC_CPU\n+#define TYPE_HOST_POWERPC_CPU POWERPC_CPU_TYPE_NAME(\"host\")\n \n #ifdef CONFIG_KVM\n \ndiff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c\nindex 4d3e635..8b27962 100644\n--- a/target/ppc/cpu-models.c\n+++ b/target/ppc/cpu-models.c\n@@ -51,7 +51,7 @@\n \\\n static const TypeInfo \\\n glue(POWERPC_DEF_PREFIX(_pvr, _svr, _type), _cpu_type_info) = { \\\n- .name = _name \"-\" TYPE_POWERPC_CPU, \\\n+ .name = POWERPC_CPU_TYPE_NAME(_name), \\\n .parent = stringify(_type) \"-family-\" TYPE_POWERPC_CPU, \\\n .class_init = \\\n glue(POWERPC_DEF_PREFIX(_pvr, _svr, _type), _cpu_class_init), \\\ndiff --git a/target/ppc/kvm.c b/target/ppc/kvm.c\nindex f31c67e..2aa5382 100644\n--- a/target/ppc/kvm.c\n+++ b/target/ppc/kvm.c\n@@ -2492,7 +2492,7 @@ static int kvm_ppc_register_host_cpu_type(void)\n char *suffix;\n \n ppc_cpu_aliases[i].model = g_strdup(object_class_get_name(oc));\n- suffix = strstr(ppc_cpu_aliases[i].model, \"-\"TYPE_POWERPC_CPU);\n+ suffix = strstr(ppc_cpu_aliases[i].model, POWERPC_CPU_TYPE_SUFFIX);\n if (suffix) {\n *suffix = 0;\n }\ndiff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c\nindex 43be9a8..f377cf2 100644\n--- a/target/ppc/translate_init.c\n+++ b/target/ppc/translate_init.c\n@@ -10185,7 +10185,7 @@ static gint ppc_cpu_compare_class_name(gconstpointer a, gconstpointer b)\n if (strncasecmp(name, object_class_get_name(oc), strlen(name)) == 0 &&\n ppc_cpu_is_valid(pcc) &&\n strcmp(object_class_get_name(oc) + strlen(name),\n- \"-\" TYPE_POWERPC_CPU) == 0) {\n+ POWERPC_CPU_TYPE_SUFFIX) == 0) {\n return 0;\n }\n return -1;\n@@ -10327,7 +10327,7 @@ static void ppc_cpu_list_entry(gpointer data, gpointer user_data)\n }\n \n name = g_strndup(typename,\n- strlen(typename) - strlen(\"-\" TYPE_POWERPC_CPU));\n+ strlen(typename) - strlen(POWERPC_CPU_TYPE_SUFFIX));\n (*s->cpu_fprintf)(s->file, \"PowerPC %-16s PVR %08x\\n\",\n name, pcc->pvr);\n for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {\n@@ -10388,7 +10388,7 @@ static void ppc_cpu_defs_entry(gpointer data, gpointer user_data)\n typename = object_class_get_name(oc);\n info = g_malloc0(sizeof(*info));\n info->name = g_strndup(typename,\n- strlen(typename) - strlen(\"-\" TYPE_POWERPC_CPU));\n+ strlen(typename) - strlen(POWERPC_CPU_TYPE_SUFFIX));\n \n entry = g_malloc0(sizeof(*entry));\n entry->value = info;\n","prefixes":["v2","2/8"]}