[{"id":1770019,"web_url":"http://patchwork.ozlabs.org/comment/1770019/","msgid":"<20170918113639.7deae179@nial.brq.redhat.com>","list_archive_url":null,"date":"2017-09-18T09:36:39","subject":"Re: [Qemu-devel] [PATCH] qom/cpu: move cpu_model null check to\n\tcpu_class_by_name()","submitter":{"id":11305,"url":"http://patchwork.ozlabs.org/api/people/11305/","name":"Igor Mammedov","email":"imammedo@redhat.com"},"content":"On Sun, 17 Sep 2017 20:28:42 -0300\nPhilippe Mathieu-Daudé wrote:\n\n> and clean every implementation.\n> \n> Suggested-by: Eduardo Habkost \n> Signed-off-by: Philippe Mathieu-Daudé \nReviewed-by: Igor Mammedov \n\n> ---\n> Based-on: 20170917232010.14183-7-f4bug@amsat.org\n> \n> qom/cpu.c | 7 ++++++-\n> target/alpha/cpu.c | 6 +-----\n> target/arm/cpu.c | 4 ----\n> target/cris/cpu.c | 4 ----\n> target/lm32/cpu.c | 4 ----\n> target/m68k/cpu.c | 4 ----\n> target/mips/cpu.c | 4 ----\n> target/moxie/cpu.c | 8 +-------\n> target/openrisc/cpu.c | 4 ----\n> target/sh4/cpu.c | 3 ---\n> target/sparc/cpu.c | 4 ----\n> target/tricore/cpu.c | 4 ----\n> target/unicore32/cpu.c | 4 ----\n> target/xtensa/cpu.c | 4 ----\n> 14 files changed, 8 insertions(+), 56 deletions(-)\n> \n> diff --git a/qom/cpu.c b/qom/cpu.c\n> index dc5392dbeb..411d8cdd2b 100644\n> --- a/qom/cpu.c\n> +++ b/qom/cpu.c\n> @@ -311,7 +311,12 @@ static bool cpu_common_has_work(CPUState *cs)\n> \n> ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model)\n> {\n> - CPUClass *cc = CPU_CLASS(object_class_by_name(typename));\n> + CPUClass *cc;\n> +\n> + if (!cpu_model) {\n> + return NULL;\n> + }\n> + cc = CPU_CLASS(object_class_by_name(typename));\n> \n> return cc->class_by_name(cpu_model);\n> }\n> diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c\n> index e6c6aabdf0..b8a21f4e01 100644\n> --- a/target/alpha/cpu.c\n> +++ b/target/alpha/cpu.c\n> @@ -127,14 +127,10 @@ static const AlphaCPUAlias alpha_cpu_aliases[] = {\n> \n> static ObjectClass *alpha_cpu_class_by_name(const char *cpu_model)\n> {\n> - ObjectClass *oc = NULL;\n> + ObjectClass *oc;\n> char *typename;\n> int i;\n> \n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> oc = object_class_by_name(cpu_model);\n> if (oc != NULL && object_class_dynamic_cast(oc, TYPE_ALPHA_CPU) != NULL &&\n> !object_class_is_abstract(oc)) {\n> diff --git a/target/arm/cpu.c b/target/arm/cpu.c\n> index 412e94c7ad..ea219c2dde 100644\n> --- a/target/arm/cpu.c\n> +++ b/target/arm/cpu.c\n> @@ -906,10 +906,6 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model)\n> char *typename;\n> char **cpuname;\n> \n> - if (!cpu_model) {\n> - return NULL;\n> - }\n> -\n> cpuname = g_strsplit(cpu_model, \",\", 1);\n> typename = g_strdup_printf(\"%s-\" TYPE_ARM_CPU, cpuname[0]);\n> oc = object_class_by_name(typename);\n> diff --git a/target/cris/cpu.c b/target/cris/cpu.c\n> index ceebfed79b..88d93f2d11 100644\n> --- a/target/cris/cpu.c\n> +++ b/target/cris/cpu.c\n> @@ -69,10 +69,6 @@ static ObjectClass *cris_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n> \n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> #if defined(CONFIG_USER_ONLY)\n> if (strcasecmp(cpu_model, \"any\") == 0) {\n> return object_class_by_name(\"crisv32-\" TYPE_CRIS_CPU);\n> diff --git a/target/lm32/cpu.c b/target/lm32/cpu.c\n> index 2b8c36b6d0..bf081f56d2 100644\n> --- a/target/lm32/cpu.c\n> +++ b/target/lm32/cpu.c\n> @@ -246,10 +246,6 @@ static ObjectClass *lm32_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n> \n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> typename = g_strdup_printf(\"%s-\" TYPE_LM32_CPU, cpu_model);\n> oc = object_class_by_name(typename);\n> g_free(typename);\n> diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c\n> index 55bf24bae6..8c70e0805c 100644\n> --- a/target/m68k/cpu.c\n> +++ b/target/m68k/cpu.c\n> @@ -87,10 +87,6 @@ static ObjectClass *m68k_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n> \n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> typename = g_strdup_printf(\"%s-\" TYPE_M68K_CPU, cpu_model);\n> oc = object_class_by_name(typename);\n> g_free(typename);\n> diff --git a/target/mips/cpu.c b/target/mips/cpu.c\n> index 1a9a3ed94d..c15b894362 100644\n> --- a/target/mips/cpu.c\n> +++ b/target/mips/cpu.c\n> @@ -166,10 +166,6 @@ static ObjectClass *mips_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n> \n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> typename = mips_cpu_type_name(cpu_model);\n> oc = object_class_by_name(typename);\n> g_free(typename);\n> diff --git a/target/moxie/cpu.c b/target/moxie/cpu.c\n> index 748d02f29e..30bd44fcad 100644\n> --- a/target/moxie/cpu.c\n> +++ b/target/moxie/cpu.c\n> @@ -89,13 +89,7 @@ static void moxie_cpu_initfn(Object *obj)\n> \n> static ObjectClass *moxie_cpu_class_by_name(const char *cpu_model)\n> {\n> - ObjectClass *oc;\n> -\n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> - oc = object_class_by_name(cpu_model);\n> + ObjectClass *oc = object_class_by_name(cpu_model);\n> if (oc != NULL && (!object_class_dynamic_cast(oc, TYPE_MOXIE_CPU) ||\n> object_class_is_abstract(oc))) {\n> return NULL;\n> diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c\n> index a979f0bf8b..af9cdcc102 100644\n> --- a/target/openrisc/cpu.c\n> +++ b/target/openrisc/cpu.c\n> @@ -108,10 +108,6 @@ static ObjectClass *openrisc_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n> \n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> typename = g_strdup_printf(\"%s-\" TYPE_OPENRISC_CPU, cpu_model);\n> oc = object_class_by_name(typename);\n> g_free(typename);\n> diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c\n> index 6ce7cba5a9..252440e019 100644\n> --- a/target/sh4/cpu.c\n> +++ b/target/sh4/cpu.c\n> @@ -133,9 +133,6 @@ static ObjectClass *superh_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> GSList *list, *item;\n> \n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> if (strcasecmp(cpu_model, \"any\") == 0) {\n> return object_class_by_name(TYPE_SH7750R_CPU);\n> }\n> diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c\n> index 0806d699e6..beab90f3e6 100644\n> --- a/target/sparc/cpu.c\n> +++ b/target/sparc/cpu.c\n> @@ -730,10 +730,6 @@ static ObjectClass *sparc_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n> \n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> typename = sparc_cpu_type_name(cpu_model);\n> oc = object_class_by_name(typename);\n> g_free(typename);\n> diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c\n> index 5ab5b56454..871eb35453 100644\n> --- a/target/tricore/cpu.c\n> +++ b/target/tricore/cpu.c\n> @@ -120,10 +120,6 @@ static ObjectClass *tricore_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n> \n> - if (!cpu_model) {\n> - return NULL;\n> - }\n> -\n> typename = g_strdup_printf(\"%s-\" TYPE_TRICORE_CPU, cpu_model);\n> oc = object_class_by_name(typename);\n> g_free(typename);\n> diff --git a/target/unicore32/cpu.c b/target/unicore32/cpu.c\n> index c9b78ce68e..138acc9dd8 100644\n> --- a/target/unicore32/cpu.c\n> +++ b/target/unicore32/cpu.c\n> @@ -44,10 +44,6 @@ static ObjectClass *uc32_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n> \n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> typename = g_strdup_printf(\"%s-\" TYPE_UNICORE32_CPU, cpu_model);\n> oc = object_class_by_name(typename);\n> g_free(typename);\n> diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c\n> index 85897df0a8..dcdc765a86 100644\n> --- a/target/xtensa/cpu.c\n> +++ b/target/xtensa/cpu.c\n> @@ -83,10 +83,6 @@ static ObjectClass *xtensa_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n> \n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> typename = g_strdup_printf(\"%s-\" TYPE_XTENSA_CPU, cpu_model);\n> oc = object_class_by_name(typename);\n> g_free(typename);","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 3xwgvS57s4z9s7M\n\tfor ;\n\tMon, 18 Sep 2017 19:39:32 +1000 (AEST)","from localhost ([::1]:35440 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtsWY-0004j8-OX\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 05:39:30 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57616)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtsUK-0003RO-Oe\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 05:37:15 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtsUJ-0002W4-AL\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 05:37:12 -0400","from mx1.redhat.com ([209.132.183.28]:52718)\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 1dtsUA-0002Sy-M4; Mon, 18 Sep 2017 05:37:02 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 7F68F4E4C6;\n\tMon, 18 Sep 2017 09:37:00 +0000 (UTC)","from nial.brq.redhat.com (unknown [10.43.2.209])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 47D5B5C891;\n\tMon, 18 Sep 2017 09:36:41 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 7F68F4E4C6","Date":"Mon, 18 Sep 2017 11:36:39 +0200","From":"Igor Mammedov ","To":"Philippe =?utf-8?q?Mathieu-Daud=C3=A9?= ","Message-ID":"<20170918113639.7deae179@nial.brq.redhat.com>","In-Reply-To":"<20170917232842.14544-1-f4bug@amsat.org>","References":"<20170917232842.14544-1-f4bug@amsat.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"quoted-printable","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tMon, 18 Sep 2017 09:37:01 +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":"Re: [Qemu-devel] [PATCH] qom/cpu: move cpu_model null check to\n\tcpu_class_by_name()","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":"Peter Maydell , Anthony Green\n\t, \n\tMark Cave-Ayland , qemu-devel@nongnu.org,\n\tMax Filippov , \n\t\"Edgar E. Iglesias\" , Guan Xuetao\n\t, =?utf-8?b?TGx1w61z?=\n\tVilanova , Marek Vasut ,\n\tAlexander Graf , \tMarcel Apfelbaum ,\n\t=?utf-8?q?Marc-Andr=C3=A9?= Lureau ,\n\tRichard Henderson , Artyom Tarasenko\n\t, Eduardo Habkost ,\n\tqemu-arm@nongnu.org, \tStefan Hajnoczi , Yongbok Kim\n\t, Stafford Horne , David\n\tGibson , Bastian Koppelmann\n\t, Chris Wulff ,\n\tLaurent Vivier , Michael Walle ,\n\tqemu-ppc@nongnu.org, Paolo Bonzini ,\n\tAurelien Jarno ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1770079,"web_url":"http://patchwork.ozlabs.org/comment/1770079/","msgid":"<17911dc7-9326-66c6-7b94-8e59d06d2af2@vivier.eu>","list_archive_url":null,"date":"2017-09-18T10:59:08","subject":"Re: [Qemu-devel] [PATCH] qom/cpu: move cpu_model null check to\n\tcpu_class_by_name()","submitter":{"id":2628,"url":"http://patchwork.ozlabs.org/api/people/2628/","name":"Laurent Vivier","email":"laurent@vivier.eu"},"content":"Le 18/09/2017 à 01:28, Philippe Mathieu-Daudé a écrit :\n> and clean every implementation.\n> \n> Suggested-by: Eduardo Habkost \n> Signed-off-by: Philippe Mathieu-Daudé \n> ---\n> Based-on: 20170917232010.14183-7-f4bug@amsat.org\n\nReviewed-by: Laurent Vivier ","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=)","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 3xwjhz3SVhz9s7G\n\tfor ;\n\tMon, 18 Sep 2017 21:00:35 +1000 (AEST)","from localhost ([::1]:35773 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dttmz-0001Hn-La\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 07:00:33 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:58204)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dttmZ-00019o-9B\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 07:00:13 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dttmT-0005O1-F7\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 07:00:07 -0400","from mout.kundenserver.de ([217.72.192.75]:53831)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dttmN-0005Lf-81; Mon, 18 Sep 2017 06:59:55 -0400","from [192.168.100.1] ([78.238.229.36]) by mrelayeu.kundenserver.de\n\t(mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id\n\t0MUo3w-1dv3SU195g-00YBOs; Mon, 18 Sep 2017 12:59:18 +0200"],"To":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ,\n\tIgor Mammedov , Eduardo Habkost\n\t, \tStefan Hajnoczi ,\n\tPaolo Bonzini , =?utf-8?q?Llu=C3=ADs_Vilanova?=\n\t, Richard Henderson ,\n\tAlexander Graf , Anthony Green ,\n\tArtyom Tarasenko ,\n\tAurelien Jarno , Bastian Koppelmann\n\t, \tChris Wulff ,\n\tDavid Gibson , \"Edgar E. Iglesias\"\n\t, Guan Xuetao ,\n\tMarek Vasut , Mark Cave-Ayland\n\t, Max Filippov ,\n\tMichael Walle , Peter Maydell\n\t, Stafford Horne ,\n\tYongbok Kim ","References":"<20170917232842.14544-1-f4bug@amsat.org>","From":"Laurent Vivier ","Message-ID":"<17911dc7-9326-66c6-7b94-8e59d06d2af2@vivier.eu>","Date":"Mon, 18 Sep 2017 12:59:08 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.3.0","MIME-Version":"1.0","In-Reply-To":"<20170917232842.14544-1-f4bug@amsat.org>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"8bit","X-Provags-ID":"V03:K0:QSXK4Ou+jCP/wgdEef+Pa/G1ECeLkRRViq4gfFhJPMR7+WmeQog\n\t60evQ7ghAqWC4gZC/trrV2rzsiPs95c/v/7Eba71GTljXJt+L05IrARwnBxh4zzCe8J+bCr\n\t2TEqzon1R7t86fNfsjzdAqqmp4bvLrJfT6I/Y3pbl+cFwSjq0CiZh3kR5GpojWjIARrmjzv\n\tkkAY+/pZb5aoiWNgD/sbw==","X-UI-Out-Filterresults":"notjunk:1; V01:K0:2jVId6bnc3Q=:QadWSLgpX4dMsZJTV/jCX3\n\t+n2jV2SsfBzx+M3uHQFk8mfnNU1RtIJHgzicgF3lzgCJL2Y9hxVczG/iinsqXtuknyLsg71DG\n\trAWaZHw6CwhHy07FEqGqgJPcZRIY6ZqoaxreeYfvm+jgP39qb9YbXVrngNyvcG0K4x6nXVLcs\n\thQwDTM+J07Lb/Hdplc22adaevBkYtlnZx0hq+Z90J25tL6dq39oeeLd0eT5SRfZIkJsDuIsJT\n\t2XNSho7R71GH2ReMDg9GqaQ4Hqz3VH9yOXuVgYGYHSxm84k6lms688mvsq5GrgidOKiCnCc2d\n\tjJ7XlQV+TYyKRPThgP0kw6mz1sdqYP4xw2Rbj4t9afzMfmn2OBocGnv+ZDmgqkCjiWxwZ+khu\n\tZeDBbdWi1g16utOdcqHcOoYpStQlSOgynss0qCLJ3upe6Mz+0Va7vEUk/kstYaL09wKWaij1H\n\t5KIxLMW38wme+aWwPWekfZ3w+K/9BAneEt24gzBtA3jLDSHQb68GZtlcznLz/tVbOZoCOdWtL\n\txnMAOPa7l/1cG1L2pQl1UFVlRaL/LudBj2MnU2YMFHBNMnppbu18vRwAC89OLMicrhJ4SG+o1\n\t1zEitRmCLpMYST4zthyCWvu6oNGhPbFUzIruwWDRRTNTK2yv8Fsr7vspB5zQhpD/0DTo7tKfe\n\tKcYdV5QeaxjtK68wWWHsgR0O6v0Jnc1KYsrQLHO3lmVH16WHChC8nK/sBOn22eLM1oT/qqZIG\n\t7c1Aml5x3tjZ3hojyJwR8Pr4KJ58UVaT80J42d5G4ks/3GUGIu87ysrsvek=","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"217.72.192.75","Subject":"Re: [Qemu-devel] [PATCH] qom/cpu: move cpu_model null check to\n\tcpu_class_by_name()","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":"Marcel Apfelbaum , =?utf-8?q?Marc-Andr=C3=A9_Lureau?=\n\t, qemu-arm@nongnu.org, qemu-ppc@nongnu.org,\n\tqemu-devel@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1770108,"web_url":"http://patchwork.ozlabs.org/comment/1770108/","msgid":"","list_archive_url":null,"date":"2017-09-18T12:05:19","subject":"Re: [Qemu-devel] [PATCH] qom/cpu: move cpu_model null check to\n\tcpu_class_by_name()","submitter":{"id":5438,"url":"http://patchwork.ozlabs.org/api/people/5438/","name":"Artyom Tarasenko","email":"atar4qemu@gmail.com"},"content":"On Mon, Sep 18, 2017 at 1:28 AM, Philippe Mathieu-Daudé wrote:\n> and clean every implementation.\n>\n> Suggested-by: Eduardo Habkost \n> Signed-off-by: Philippe Mathieu-Daudé \n\nReviewed-by: Artyom Tarasenko \n\n> ---\n> Based-on: 20170917232010.14183-7-f4bug@amsat.org\n>\n> qom/cpu.c | 7 ++++++-\n> target/alpha/cpu.c | 6 +-----\n> target/arm/cpu.c | 4 ----\n> target/cris/cpu.c | 4 ----\n> target/lm32/cpu.c | 4 ----\n> target/m68k/cpu.c | 4 ----\n> target/mips/cpu.c | 4 ----\n> target/moxie/cpu.c | 8 +-------\n> target/openrisc/cpu.c | 4 ----\n> target/sh4/cpu.c | 3 ---\n> target/sparc/cpu.c | 4 ----\n> target/tricore/cpu.c | 4 ----\n> target/unicore32/cpu.c | 4 ----\n> target/xtensa/cpu.c | 4 ----\n> 14 files changed, 8 insertions(+), 56 deletions(-)\n>\n> diff --git a/qom/cpu.c b/qom/cpu.c\n> index dc5392dbeb..411d8cdd2b 100644\n> --- a/qom/cpu.c\n> +++ b/qom/cpu.c\n> @@ -311,7 +311,12 @@ static bool cpu_common_has_work(CPUState *cs)\n>\n> ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model)\n> {\n> - CPUClass *cc = CPU_CLASS(object_class_by_name(typename));\n> + CPUClass *cc;\n> +\n> + if (!cpu_model) {\n> + return NULL;\n> + }\n> + cc = CPU_CLASS(object_class_by_name(typename));\n>\n> return cc->class_by_name(cpu_model);\n> }\n> diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c\n> index e6c6aabdf0..b8a21f4e01 100644\n> --- a/target/alpha/cpu.c\n> +++ b/target/alpha/cpu.c\n> @@ -127,14 +127,10 @@ static const AlphaCPUAlias alpha_cpu_aliases[] = {\n>\n> static ObjectClass *alpha_cpu_class_by_name(const char *cpu_model)\n> {\n> - ObjectClass *oc = NULL;\n> + ObjectClass *oc;\n> char *typename;\n> int i;\n>\n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> oc = object_class_by_name(cpu_model);\n> if (oc != NULL && object_class_dynamic_cast(oc, TYPE_ALPHA_CPU) != NULL &&\n> !object_class_is_abstract(oc)) {\n> diff --git a/target/arm/cpu.c b/target/arm/cpu.c\n> index 412e94c7ad..ea219c2dde 100644\n> --- a/target/arm/cpu.c\n> +++ b/target/arm/cpu.c\n> @@ -906,10 +906,6 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model)\n> char *typename;\n> char **cpuname;\n>\n> - if (!cpu_model) {\n> - return NULL;\n> - }\n> -\n> cpuname = g_strsplit(cpu_model, \",\", 1);\n> typename = g_strdup_printf(\"%s-\" TYPE_ARM_CPU, cpuname[0]);\n> oc = object_class_by_name(typename);\n> diff --git a/target/cris/cpu.c b/target/cris/cpu.c\n> index ceebfed79b..88d93f2d11 100644\n> --- a/target/cris/cpu.c\n> +++ b/target/cris/cpu.c\n> @@ -69,10 +69,6 @@ static ObjectClass *cris_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n>\n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> #if defined(CONFIG_USER_ONLY)\n> if (strcasecmp(cpu_model, \"any\") == 0) {\n> return object_class_by_name(\"crisv32-\" TYPE_CRIS_CPU);\n> diff --git a/target/lm32/cpu.c b/target/lm32/cpu.c\n> index 2b8c36b6d0..bf081f56d2 100644\n> --- a/target/lm32/cpu.c\n> +++ b/target/lm32/cpu.c\n> @@ -246,10 +246,6 @@ static ObjectClass *lm32_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n>\n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> typename = g_strdup_printf(\"%s-\" TYPE_LM32_CPU, cpu_model);\n> oc = object_class_by_name(typename);\n> g_free(typename);\n> diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c\n> index 55bf24bae6..8c70e0805c 100644\n> --- a/target/m68k/cpu.c\n> +++ b/target/m68k/cpu.c\n> @@ -87,10 +87,6 @@ static ObjectClass *m68k_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n>\n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> typename = g_strdup_printf(\"%s-\" TYPE_M68K_CPU, cpu_model);\n> oc = object_class_by_name(typename);\n> g_free(typename);\n> diff --git a/target/mips/cpu.c b/target/mips/cpu.c\n> index 1a9a3ed94d..c15b894362 100644\n> --- a/target/mips/cpu.c\n> +++ b/target/mips/cpu.c\n> @@ -166,10 +166,6 @@ static ObjectClass *mips_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n>\n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> typename = mips_cpu_type_name(cpu_model);\n> oc = object_class_by_name(typename);\n> g_free(typename);\n> diff --git a/target/moxie/cpu.c b/target/moxie/cpu.c\n> index 748d02f29e..30bd44fcad 100644\n> --- a/target/moxie/cpu.c\n> +++ b/target/moxie/cpu.c\n> @@ -89,13 +89,7 @@ static void moxie_cpu_initfn(Object *obj)\n>\n> static ObjectClass *moxie_cpu_class_by_name(const char *cpu_model)\n> {\n> - ObjectClass *oc;\n> -\n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> - oc = object_class_by_name(cpu_model);\n> + ObjectClass *oc = object_class_by_name(cpu_model);\n> if (oc != NULL && (!object_class_dynamic_cast(oc, TYPE_MOXIE_CPU) ||\n> object_class_is_abstract(oc))) {\n> return NULL;\n> diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c\n> index a979f0bf8b..af9cdcc102 100644\n> --- a/target/openrisc/cpu.c\n> +++ b/target/openrisc/cpu.c\n> @@ -108,10 +108,6 @@ static ObjectClass *openrisc_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n>\n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> typename = g_strdup_printf(\"%s-\" TYPE_OPENRISC_CPU, cpu_model);\n> oc = object_class_by_name(typename);\n> g_free(typename);\n> diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c\n> index 6ce7cba5a9..252440e019 100644\n> --- a/target/sh4/cpu.c\n> +++ b/target/sh4/cpu.c\n> @@ -133,9 +133,6 @@ static ObjectClass *superh_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> GSList *list, *item;\n>\n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> if (strcasecmp(cpu_model, \"any\") == 0) {\n> return object_class_by_name(TYPE_SH7750R_CPU);\n> }\n> diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c\n> index 0806d699e6..beab90f3e6 100644\n> --- a/target/sparc/cpu.c\n> +++ b/target/sparc/cpu.c\n> @@ -730,10 +730,6 @@ static ObjectClass *sparc_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n>\n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> typename = sparc_cpu_type_name(cpu_model);\n> oc = object_class_by_name(typename);\n> g_free(typename);\n> diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c\n> index 5ab5b56454..871eb35453 100644\n> --- a/target/tricore/cpu.c\n> +++ b/target/tricore/cpu.c\n> @@ -120,10 +120,6 @@ static ObjectClass *tricore_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n>\n> - if (!cpu_model) {\n> - return NULL;\n> - }\n> -\n> typename = g_strdup_printf(\"%s-\" TYPE_TRICORE_CPU, cpu_model);\n> oc = object_class_by_name(typename);\n> g_free(typename);\n> diff --git a/target/unicore32/cpu.c b/target/unicore32/cpu.c\n> index c9b78ce68e..138acc9dd8 100644\n> --- a/target/unicore32/cpu.c\n> +++ b/target/unicore32/cpu.c\n> @@ -44,10 +44,6 @@ static ObjectClass *uc32_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n>\n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> typename = g_strdup_printf(\"%s-\" TYPE_UNICORE32_CPU, cpu_model);\n> oc = object_class_by_name(typename);\n> g_free(typename);\n> diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c\n> index 85897df0a8..dcdc765a86 100644\n> --- a/target/xtensa/cpu.c\n> +++ b/target/xtensa/cpu.c\n> @@ -83,10 +83,6 @@ static ObjectClass *xtensa_cpu_class_by_name(const char *cpu_model)\n> ObjectClass *oc;\n> char *typename;\n>\n> - if (cpu_model == NULL) {\n> - return NULL;\n> - }\n> -\n> typename = g_strdup_printf(\"%s-\" TYPE_XTENSA_CPU, cpu_model);\n> oc = object_class_by_name(typename);\n> g_free(typename);\n> --\n> 2.14.1\n>","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\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"Xw0SpITz\"; dkim-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 3xwl8g1NzKz9s78\n\tfor ;\n\tMon, 18 Sep 2017 22:06:11 +1000 (AEST)","from localhost ([::1]:36204 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtuoT-00044a-90\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 08:06:09 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:50108)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtuo4-000441-79\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 08:05:46 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtuo2-0003Er-EM\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 08:05:44 -0400","from mail-it0-x244.google.com ([2607:f8b0:4001:c0b::244]:35613)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dtuo1-0003DI-Ru; Mon, 18 Sep 2017 08:05:42 -0400","by mail-it0-x244.google.com with SMTP id u2so384009itb.2;\n\tMon, 18 Sep 2017 05:05:40 -0700 (PDT)","by 10.2.79.194 with HTTP; Mon, 18 Sep 2017 05:05:19 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=mime-version:in-reply-to:references:from:date:message-id:subject:to\n\t:cc:content-transfer-encoding;\n\tbh=OKtMhrOrRfeHgcEradYgfapL5s6yuG33/LK/O6iYqTM=;\n\tb=Xw0SpITzHeRFFgTzQwLPMZUjEXxSp1EBdLCJd9Et2llJrPXtGn3W1T8dh5/Jm6K893\n\tspBgHBMirnkkayqspUlF1/zmHUuBUWlTH7ZnlJEPhs9SaXOcVR/Xe0VUhswcnUaJUnXD\n\tajd/V1ilwpYjWMZDv2zQFBSY/fJBXrF+94DdK6d5gt0DZbCxvzkWpZ/NABiTWQ3tvLGl\n\tQkbCtH5Hm7PB6ZhEAQHPmx1ojFbFYFkJfFsOTQGkUSvE6kNG+jCO/lgHkj16q9VDtft/\n\tthebFtAeVtiGZQ8Ik9AKUkIsmUdio0Iz8dKwOWLoA+oxJ14gbBDHY+OoWSrFYDN7mc93\n\ti59g==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:in-reply-to:references:from:date\n\t:message-id:subject:to:cc:content-transfer-encoding;\n\tbh=OKtMhrOrRfeHgcEradYgfapL5s6yuG33/LK/O6iYqTM=;\n\tb=QcAvZ2XeYEamZnby+7IMNpABQcK/VQGTF6eDZ0/y4Zty0nmU3hVi4aYkOCCc9VIILX\n\t3+ani0eCsdTf72vfaPN826XgJk4L99WfiSVApsz3qy9tJVdcY9iL3h3kCNlfJLJS1uFC\n\tGrbHk7V+MENkI7uFoG1xOms9M1gcBEvgZzToqvuMy0d+gqwtsdQMND8mWzTisq+k6R3S\n\tGA3vy7TN5g9dtzJ19Jwdw6+DyQRcqaRVR4CSJEygjJ714Bq0FIUFLRqBAMq18zoSdqAb\n\tGlxcIi72PPpp0Uz4hy2zqOomn5jT/oOGMy7dyuN8sse0LOSGp2zvUxzonYxbwH15TYpR\n\tefbA==","X-Gm-Message-State":"AHPjjUilL19Vl32xPfXG+1LwbZpFad1om1+Ah1WCL5R8mhH82Md510bz\n\tfqRfotWaa354JLfCdjV+nCGauW8aAj3glgl1ziw=","X-Google-Smtp-Source":"AOwi7QAtCS1ZdoFpcWoWPJ2w2zWg5/ttOhQ1F3Il0IPLuiREO3StMkGjA29plmmv16p7HGxOnAss0kZGmOBnn6O6AZs=","X-Received":"by 10.36.200.10 with SMTP id w10mr18223267itf.4.1505736339640;\n\tMon, 18 Sep 2017 05:05:39 -0700 (PDT)","MIME-Version":"1.0","In-Reply-To":"<20170917232842.14544-1-f4bug@amsat.org>","References":"<20170917232842.14544-1-f4bug@amsat.org>","From":"Artyom Tarasenko ","Date":"Mon, 18 Sep 2017 14:05:19 +0200","Message-ID":"","To":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","Content-Type":"text/plain; charset=\"UTF-8\"","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2607:f8b0:4001:c0b::244","Subject":"Re: [Qemu-devel] [PATCH] qom/cpu: move cpu_model null check to\n\tcpu_class_by_name()","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":"Peter Maydell , Anthony Green\n\t, \n\tMark Cave-Ayland , qemu-devel\n\t, Max Filippov , \"Edgar E.\n\tIglesias\" , \n\tGuan Xuetao , =?utf-8?q?Llu=C3=ADs_Vilanova?=\n\t, Marek Vasut ,\n\tAlexander Graf , \tMarcel Apfelbaum ,\n\t=?utf-8?q?Marc-Andr=C3=A9_Lurea?= =?utf-8?q?u?=\n\t, Richard Henderson ,\n\tEduardo Habkost , \"open list:ARM\"\n\t, Stefan Hajnoczi ,\n\tIgor Mammedov , Yongbok Kim\n\t, Stafford Horne , David\n\tGibson , Bastian Koppelmann\n\t, Chris Wulff ,\n\tLaurent Vivier , Michael Walle ,\n\tqemu-ppc@nongnu.org, Paolo Bonzini ,\n\tAurelien Jarno ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]