{"id":811515,"url":"http://patchwork.ozlabs.org/api/patches/811515/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170908103558.31632-34-david@gibson.dropbear.id.au/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170908103558.31632-34-david@gibson.dropbear.id.au>","list_archive_url":null,"date":"2017-09-08T10:35:51","name":"[PULL,33/40] ppc: use macros to make cpu type name from string literal","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ccc1f7a43d9df0cb9c66545d886cf4e0878f81ba","submitter":{"id":47,"url":"http://patchwork.ozlabs.org/api/people/47/?format=json","name":"David Gibson","email":"david@gibson.dropbear.id.au"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170908103558.31632-34-david@gibson.dropbear.id.au/mbox/","series":[{"id":2179,"url":"http://patchwork.ozlabs.org/api/series/2179/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2179","date":"2017-09-08T10:35:20","name":"[PULL,01/40] hw/ppc/spapr_drc.c: change spapr_drc_needed to use drc->dev","version":1,"mbox":"http://patchwork.ozlabs.org/series/2179/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811515/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811515/checks/","tags":{},"related":[],"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=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=gibson.dropbear.id.au\n\theader.i=@gibson.dropbear.id.au header.b=\"jAYQYbD8\"; \n\tdkim-atps=neutral"],"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 3xpYzB6rpqz9s3w\n\tfor ;\n\tFri, 8 Sep 2017 20:51:34 +1000 (AEST)","from localhost ([::1]:44518 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dqGsm-0007S6-UM\n\tfor incoming@patchwork.ozlabs.org; Fri, 08 Sep 2017 06:51:32 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:58867)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dqGeD-0002FK-MF\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 06:36:40 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dqGe5-0003LK-NR\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 06:36:29 -0400","from ozlabs.org ([2401:3900:2:1::2]:47577)\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 1dqGe5-0003IX-Co; Fri, 08 Sep 2017 06:36:21 -0400","by ozlabs.org (Postfix, from userid 1007)\n\tid 3xpYdQ0QyNz9t5V; Fri, 8 Sep 2017 20:36:08 +1000 (AEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple;\n\td=gibson.dropbear.id.au; s=201602; t=1504866970;\n\tbh=7OMgoMbsff61zNAX6hx4PYUI3leeOBieZZnQQ5KfJfM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=jAYQYbD8o0W97wmiNoilgXAJ3odQF+krQdP/zoaIqsf9mX7FLnr9YiHmNj6ElLLSy\n\t2qJyeKxEBUuR6X40yZjQImZX8WLcqHVmEG0I1TSTKp+i2sRmTpInWY4JYb9dhkVeJr\n\tAxuR1ju42hf0zRc/Cjl1WC2wW+/Q+rYmMiZw4H34=","From":"David Gibson ","To":"peter.maydell@linaro.org","Date":"Fri, 8 Sep 2017 20:35:51 +1000","Message-Id":"<20170908103558.31632-34-david@gibson.dropbear.id.au>","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170908103558.31632-1-david@gibson.dropbear.id.au>","References":"<20170908103558.31632-1-david@gibson.dropbear.id.au>","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2401:3900:2:1::2","Subject":"[Qemu-devel] [PULL 33/40] 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-devel@nongnu.org, aik@ozlabs.ru, agraf@suse.de,\n\tmdroth@linux.vnet.ibm.com, qemu-ppc@nongnu.org,\n\timammedo@redhat.com, sam.bobroff@au1.ibm.com,\n\tDavid Gibson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Igor Mammedov \n\nReplace\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 \nSigned-off-by: David Gibson \n---\n target/ppc/cpu-models.c | 2 +-\n target/ppc/cpu.h | 3 +++\n target/ppc/kvm.c | 2 +-\n target/ppc/kvm_ppc.h | 2 +-\n target/ppc/translate_init.c | 6 +++---\n 5 files changed, 9 insertions(+), 6 deletions(-)","diff":"diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c\nindex e0d9faf848..782977425b 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/cpu.h b/target/ppc/cpu.h\nindex 042372c5ad..c9d3ffa89b 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.c b/target/ppc/kvm.c\nindex b6bd0fa7a6..abcfe13b8a 100644\n--- a/target/ppc/kvm.c\n+++ b/target/ppc/kvm.c\n@@ -2529,7 +2529,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/kvm_ppc.h b/target/ppc/kvm_ppc.h\nindex e6711fc2b7..f780e6ec7b 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/translate_init.c b/target/ppc/translate_init.c\nindex 703ea12f2a..ee42c56288 100644\n--- a/target/ppc/translate_init.c\n+++ b/target/ppc/translate_init.c\n@@ -10261,7 +10261,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@@ -10403,7 +10403,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@@ -10464,7 +10464,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":["PULL","33/40"]}