{"id":811519,"url":"http://patchwork.ozlabs.org/api/patches/811519/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170908103558.31632-37-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-37-david@gibson.dropbear.id.au>","list_archive_url":null,"date":"2017-09-08T10:35:54","name":"[PULL,36/40] ppc: replace inter-function cyclic dependency/recurssion with 2 simple lookups","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"1e4b79e09874a09d407287fbac11044cc5fe24d4","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-37-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/811519/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811519/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=\"AFi4ZIz9\"; \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 3xpZ2B44MSz9sCZ\n\tfor ;\n\tFri, 8 Sep 2017 20:54:10 +1000 (AEST)","from localhost ([::1]:44529 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dqGvI-0001bI-HS\n\tfor incoming@patchwork.ozlabs.org; Fri, 08 Sep 2017 06:54:08 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:58886)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dqGeE-0002GH-CA\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 06:36:41 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dqGe6-0003ME-81\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 06:36:30 -0400","from ozlabs.org ([2401:3900:2:1::2]:38375)\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-0003JF-Tx; Fri, 08 Sep 2017 06:36:22 -0400","by ozlabs.org (Postfix, from userid 1007)\n\tid 3xpYdQ14Qyz9t67; Fri, 8 Sep 2017 20:36:09 +1000 (AEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple;\n\td=gibson.dropbear.id.au; s=201602; t=1504866970;\n\tbh=YFB0SJok8k2L2cQ/uSZriHNbTlDQ5H9cGr+hFP4XMMg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=AFi4ZIz9VU8m/Kxrho/5xfergROViiiwJLV2rUEp/hsjlReX5bi4Z6MqlhoJkPAHb\n\tBb2ejQcVVT1D0ksvcgexwctuZdovv6MbQacAACOIB/68+j8n5X+PYlezcThi/kkmu6\n\td9I8S5HV7cSAFN4zFSNH1vTtStBouSbCmGV6Yrck=","From":"David Gibson ","To":"peter.maydell@linaro.org","Date":"Fri, 8 Sep 2017 20:35:54 +1000","Message-Id":"<20170908103558.31632-37-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 36/40] ppc: replace inter-function cyclic\n\tdependency/recurssion with 2 simple lookups","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\nprevious patches cleaned up cpu model/alias naming which\nallows to simplify cpu model/alias to cpu type lookup a bit\nbyt removing recurssion and dependency of ppc_cpu_class_by_name() /\nppc_cpu_class_by_alias() on each other.\nBesides of simplifying code it reduces it by ~15LOC.\n\nSigned-off-by: Igor Mammedov \nReviewed-by: David Gibson \nSigned-off-by: David Gibson \n---\n target/ppc/translate_init.c | 43 +++++++++++++------------------------------\n 1 file changed, 13 insertions(+), 30 deletions(-)","diff":"diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c\nindex f392fa6ea9..4092310c83 100644\n--- a/target/ppc/translate_init.c\n+++ b/target/ppc/translate_init.c\n@@ -10252,22 +10252,6 @@ PowerPCCPUClass *ppc_cpu_class_by_pvr_mask(uint32_t pvr)\n return pcc;\n }\n \n-static gint ppc_cpu_compare_class_name(gconstpointer a, gconstpointer b)\n-{\n- ObjectClass *oc = (ObjectClass *)a;\n- const char *name = b;\n- PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);\n-\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- POWERPC_CPU_TYPE_SUFFIX) == 0) {\n- return 0;\n- }\n- return -1;\n-}\n-\n-\n static ObjectClass *ppc_cpu_class_by_name(const char *name);\n \n static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)\n@@ -10292,8 +10276,8 @@ static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)\n \n static ObjectClass *ppc_cpu_class_by_name(const char *name)\n {\n- GSList *list, *item;\n- ObjectClass *ret = NULL;\n+ char *cpu_model, *typename;\n+ ObjectClass *oc;\n const char *p;\n int i, len;\n \n@@ -10314,21 +10298,20 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)\n }\n }\n \n- list = object_class_get_list(TYPE_POWERPC_CPU, false);\n- item = g_slist_find_custom(list, name, ppc_cpu_compare_class_name);\n- if (item != NULL) {\n- ret = OBJECT_CLASS(item->data);\n+ cpu_model = g_ascii_strdown(name, -1);\n+ p = ppc_cpu_lookup_alias(cpu_model);\n+ if (p) {\n+ g_free(cpu_model);\n+ cpu_model = g_strdup(p);\n }\n- g_slist_free(list);\n \n- if (ret) {\n- return ret;\n- }\n+ typename = g_strdup_printf(\"%s\" POWERPC_CPU_TYPE_SUFFIX, cpu_model);\n+ oc = object_class_by_name(typename);\n+ g_free(typename);\n+ g_free(cpu_model);\n \n- for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) {\n- if (strcasecmp(ppc_cpu_aliases[i].alias, name) == 0) {\n- return ppc_cpu_class_by_alias(&ppc_cpu_aliases[i]);\n- }\n+ if (oc && ppc_cpu_is_valid(POWERPC_CPU_CLASS(oc))) {\n+ return oc;\n }\n \n return NULL;\n","prefixes":["PULL","36/40"]}