{"id":807634,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807634/?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-6-git-send-email-imammedo@redhat.com>","date":"2017-08-30T13:24:32","name":"[v2,5/8] 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":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-6-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/807634/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-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.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 3xj5t159Z0z9sQl\n\tfor ;\n\tWed, 30 Aug 2017 23:28:09 +1000 (AEST)","from localhost ([::1]:50577 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn32N-00048u-Dg\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 09:28:07 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:50952)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn2z8-0001on-Rc\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 09:24:52 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn2z7-0003Xy-PB\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 09:24:46 -0400","from mx1.redhat.com ([209.132.183.28]:37594)\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 1dn2z7-0003XV-GQ; Wed, 30 Aug 2017 09:24:45 -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 87AD55F739;\n\tWed, 30 Aug 2017 13:24:44 +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 7F10177DEE;\n\tWed, 30 Aug 2017 13:24:43 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 87AD55F739","From":"Igor Mammedov ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 15:24:32 +0200","Message-Id":"<1504099475-241036-6-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.39]);\n\tWed, 30 Aug 2017 13:24:44 +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 5/8] 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-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":"previous 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 \n---\nv2:\n s/g_ascii_strup/g_ascii_strdown/ due to switch to lower-cased model names\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 0325226..cf0d795 100644\n--- a/target/ppc/translate_init.c\n+++ b/target/ppc/translate_init.c\n@@ -10176,22 +10176,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@@ -10216,8 +10200,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@@ -10238,21 +10222,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":["v2","5/8"]}