[{"id":1771917,"web_url":"http://patchwork.ozlabs.org/comment/1771917/","msgid":"<4ca9137f-dc5c-0ecd-9a28-b5338b337584@amsat.org>","list_archive_url":null,"date":"2017-09-20T11:38:39","subject":"Re: [Qemu-devel] [PATCH v3 6/6] mips: replace cpu_mips_init() with\n\tcpu_generic_init()","submitter":{"id":70924,"url":"http://patchwork.ozlabs.org/api/people/70924/","name":"Philippe Mathieu-Daudé","email":"f4bug@amsat.org"},"content":"On 09/20/2017 06:21 AM, Igor Mammedov wrote:\n> Philippe Mathieu-Daudé wrote:\n> \n> Hi Philippe,\n> \n> since series were sitting unmerged on list for a long time\n> path won't apply due to context changes on top of\n> [PATCH v2 0/5] generalize parsing of cpu_model (x86/arm)\n> for which Eduardo posted pull req yesterday.\n\nThanks to notify me, I didn't notice!\n\n> Could you rebase this patch on top of pull req\n> (it's only this one patch, the rest applies fine)\n\nSure :)","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=\"oQI9XZMz\"; 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 3xy28L1spCz9sNr\n\tfor ;\n\tThu, 21 Sep 2017 00:25:21 +1000 (AEST)","from localhost ([::1]:48432 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dufwE-000443-Ux\n\tfor incoming@patchwork.ozlabs.org; Wed, 20 Sep 2017 10:25:19 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:38666)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from )\n\tid 1duf5L-00065y-S3\n\tfor qemu-devel@nongnu.org; Wed, 20 Sep 2017 09:30:43 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from )\n\tid 1duf5H-0006YS-Si\n\tfor qemu-devel@nongnu.org; Wed, 20 Sep 2017 09:30:39 -0400","from mail-qt0-x230.google.com ([2607:f8b0:400d:c0d::230]:48570)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1duf5H-0006VX-Pd\n\tfor qemu-devel@nongnu.org; Wed, 20 Sep 2017 09:30:35 -0400","by mail-qt0-x230.google.com with SMTP id q8so2750466qtb.5\n\tfor ; Wed, 20 Sep 2017 06:30:34 -0700 (PDT)","from [192.168.1.10] ([181.93.89.178])\n\tby smtp.gmail.com with ESMTPSA id\n\th4sm1160848qth.75.2017.09.20.04.38.40\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 20 Sep 2017 04:38:44 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=sender:subject:to:cc:references:from:message-id:date:user-agent\n\t:mime-version:in-reply-to:content-language:content-transfer-encoding; \n\tbh=IBVJQiJ0ZXI1oJy2A5ABiWzMwD2ydsL6NRok2jfyDcc=;\n\tb=oQI9XZMz3iGYvEE3iF3a5d9fRZ4WeKFqC0JIHMVVoWTG+eIo+5ZG1FPy8FN58H5JI1\n\tWZuOxPUCa0w+p/vHvFVpVSrYP4tCCEVxxNyE7SLevTZipsSaM2BuJsf5laefzq8TXzIN\n\tPhVqgadqID3JdO5ocTV1rEQjF9hPxyQ2br2+oxT4++J0Er7M8JN+S3S1zPulKIOXMLmL\n\tetTGjzV2KTvMa/k9NIpBB9errlirKx7ehV1q3vUHgvL1jOlBMIw/BZJQ0DyE8ofHvEZO\n\tqIcF+LUIgyLoy+4SA2Kllojjh3f+dF0reGC45RH19EHIkPr6Spag9VNh2HuzBCzvuduq\n\tW3Lw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:subject:to:cc:references:from:message-id\n\t:date:user-agent:mime-version:in-reply-to:content-language\n\t:content-transfer-encoding;\n\tbh=IBVJQiJ0ZXI1oJy2A5ABiWzMwD2ydsL6NRok2jfyDcc=;\n\tb=tYCdpjVE56WysBUz+8g1iNjycMjgrKTH1sBVe4h1rhswhvrpP02o5T2s5/6SfW3nE3\n\tXjusJXV819M3Xe3KSPB2o589ifiNVsJkun8jy5w2ZTUy7lDVXyJ3Yfbkgfa31+4Xtgjb\n\t88aupw8fg5I4YGEE/GuLJlLl8CsSizayhH4iuAmDPLfTv3lt8kGuLTFGtYGcoTqGpSTD\n\tiiP4Bc/xqlyoOEQIn+15wxlk/q618spMM8X++tlcfdnxUmuiBWhUUh8sbf3yKevJwR66\n\tpPwxnypzd1jlZb/y5K9fPfczdavO1jsNFQvL6L7e+zQgIq0oCDQLlTAL/K8OrJf1i4v5\n\t/ZzQ==","X-Gm-Message-State":"AHPjjUiIC7LYlXh5/aiUHF2+xQd6IPsykQDXzOgzumWr1J+Im5EEPGR/\n\tcbtaPv+nQe1blcu3DibCxAYG6wfD","X-Google-Smtp-Source":"AOwi7QDC8K26Qa1+taNab4AYHIyrjgANO2CJclPyq3POzAzQDBXNDXN0Iet2LtwMiJlGO74h437PLw==","X-Received":"by 10.200.45.73 with SMTP id o9mr6618088qta.292.1505907525997;\n\tWed, 20 Sep 2017 04:38:45 -0700 (PDT)","To":"Igor Mammedov ","References":"<20170917232010.14183-1-f4bug@amsat.org>\n\t<20170917232010.14183-7-f4bug@amsat.org>\n\t<20170920112116.6885549f@nial.brq.redhat.com>","From":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","Message-ID":"<4ca9137f-dc5c-0ecd-9a28-b5338b337584@amsat.org>","Date":"Wed, 20 Sep 2017 08:38:39 -0300","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":"<20170920112116.6885549f@nial.brq.redhat.com>","Content-Type":"text/plain; charset=utf-8; format=flowed","Content-Language":"en-US","Content-Transfer-Encoding":"8bit","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2607:f8b0:400d:c0d::230","Subject":"Re: [Qemu-devel] [PATCH v3 6/6] mips: replace cpu_mips_init() with\n\tcpu_generic_init()","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":"Thomas Huth , James Hogan ,\n\tEduardo Habkost , qemu-devel@nongnu.org, Marcel\n\tApfelbaum , =?utf-8?q?Herv=C3=A9_Poussineau?=\n\t, Yongbok Kim ,\n\tAurelien Jarno ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1771973,"web_url":"http://patchwork.ozlabs.org/comment/1771973/","msgid":"<20170920112116.6885549f@nial.brq.redhat.com>","list_archive_url":null,"date":"2017-09-20T09:21:16","subject":"Re: [Qemu-devel] [PATCH v3 6/6] mips: replace cpu_mips_init() with\n\tcpu_generic_init()","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:20:10 -0300\nPhilippe Mathieu-Daudé wrote:\n\nHi Philippe,\n\nsince series were sitting unmerged on list for a long time\npath won't apply due to context changes on top of\n [PATCH v2 0/5] generalize parsing of cpu_model (x86/arm)\nfor which Eduardo posted pull req yesterday.\n\nCould you rebase this patch on top of pull req\n(it's only this one patch, the rest applies fine)\n\n> From: Igor Mammedov \n> \n> now cpu_mips_init() reimplements subset of cpu_generic_init()\n> tasks, so just drop it and use cpu_generic_init() directly.\n> \n> Signed-off-by: Igor Mammedov \n> Reviewed-by: Hervé Poussineau \n> Signed-off-by: Philippe Mathieu-Daudé \n> [PMD: use internal.h instead of cpu.h]\n> Tested-by: James Hogan \n> Reviewed-by: Eduardo Habkost \n> ---\n> target/mips/cpu.h | 3 +--\n> hw/mips/cps.c | 2 +-\n> hw/mips/mips_fulong2e.c | 2 +-\n> hw/mips/mips_jazz.c | 2 +-\n> hw/mips/mips_malta.c | 2 +-\n> hw/mips/mips_mipssim.c | 2 +-\n> hw/mips/mips_r4k.c | 2 +-\n> target/mips/translate.c | 17 -----------------\n> 8 files changed, 7 insertions(+), 25 deletions(-)\n> \n> diff --git a/target/mips/cpu.h b/target/mips/cpu.h\n> index 2f81e0f950..66265e4eb6 100644\n> --- a/target/mips/cpu.h\n> +++ b/target/mips/cpu.h\n> @@ -737,10 +737,9 @@ enum {\n> */\n> #define CPU_INTERRUPT_WAKE CPU_INTERRUPT_TGT_INT_0\n> \n> -MIPSCPU *cpu_mips_init(const char *cpu_model);\n> int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc);\n> \n> -#define cpu_init(cpu_model) CPU(cpu_mips_init(cpu_model))\n> +#define cpu_init(cpu_model) cpu_generic_init(TYPE_MIPS_CPU, cpu_model)\n> bool cpu_supports_cps_smp(const char *cpu_model);\n> bool cpu_supports_isa(const char *cpu_model, unsigned int isa);\n> void cpu_set_exception_base(int vp_index, target_ulong address);\n> diff --git a/hw/mips/cps.c b/hw/mips/cps.c\n> index 4ef337d5c4..708899cf92 100644\n> --- a/hw/mips/cps.c\n> +++ b/hw/mips/cps.c\n> @@ -71,7 +71,7 @@ static void mips_cps_realize(DeviceState *dev, Error **errp)\n> bool itu_present = false;\n> \n> for (i = 0; i < s->num_vp; i++) {\n> - cpu = cpu_mips_init(s->cpu_model);\n> + cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, s->cpu_model));\n> if (cpu == NULL) {\n> error_setg(errp, \"%s: CPU initialization failed\", __func__);\n> return;\n> diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c\n> index 3532399a13..5d9462ec35 100644\n> --- a/hw/mips/mips_fulong2e.c\n> +++ b/hw/mips/mips_fulong2e.c\n> @@ -280,7 +280,7 @@ static void mips_fulong2e_init(MachineState *machine)\n> if (cpu_model == NULL) {\n> cpu_model = \"Loongson-2E\";\n> }\n> - cpu = cpu_mips_init(cpu_model);\n> + cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, cpu_model));\n> if (cpu == NULL) {\n> fprintf(stderr, \"Unable to find CPU definition\\n\");\n> exit(1);\n> diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c\n> index df2262a2a8..c1402de1ce 100644\n> --- a/hw/mips/mips_jazz.c\n> +++ b/hw/mips/mips_jazz.c\n> @@ -151,7 +151,7 @@ static void mips_jazz_init(MachineState *machine,\n> if (cpu_model == NULL) {\n> cpu_model = \"R4000\";\n> }\n> - cpu = cpu_mips_init(cpu_model);\n> + cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, cpu_model));\n> if (cpu == NULL) {\n> fprintf(stderr, \"Unable to find CPU definition\\n\");\n> exit(1);\n> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c\n> index af678f5784..9ecdc818b1 100644\n> --- a/hw/mips/mips_malta.c\n> +++ b/hw/mips/mips_malta.c\n> @@ -931,7 +931,7 @@ static void create_cpu_without_cps(const char *cpu_model,\n> int i;\n> \n> for (i = 0; i < smp_cpus; i++) {\n> - cpu = cpu_mips_init(cpu_model);\n> + cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, cpu_model));\n> if (cpu == NULL) {\n> fprintf(stderr, \"Unable to find CPU definition\\n\");\n> exit(1);\n> diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c\n> index 07fc4c2300..1166834f54 100644\n> --- a/hw/mips/mips_mipssim.c\n> +++ b/hw/mips/mips_mipssim.c\n> @@ -163,7 +163,7 @@ mips_mipssim_init(MachineState *machine)\n> cpu_model = \"24Kf\";\n> #endif\n> }\n> - cpu = cpu_mips_init(cpu_model);\n> + cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, cpu_model));\n> if (cpu == NULL) {\n> fprintf(stderr, \"Unable to find CPU definition\\n\");\n> exit(1);\n> diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c\n> index 2f5ced7409..de212f5c13 100644\n> --- a/hw/mips/mips_r4k.c\n> +++ b/hw/mips/mips_r4k.c\n> @@ -193,7 +193,7 @@ void mips_r4k_init(MachineState *machine)\n> cpu_model = \"24Kf\";\n> #endif\n> }\n> - cpu = cpu_mips_init(cpu_model);\n> + cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, cpu_model));\n> if (cpu == NULL) {\n> fprintf(stderr, \"Unable to find CPU definition\\n\");\n> exit(1);\n> diff --git a/target/mips/translate.c b/target/mips/translate.c\n> index f7128bc91d..d16d879df7 100644\n> --- a/target/mips/translate.c\n> +++ b/target/mips/translate.c\n> @@ -20523,23 +20523,6 @@ void cpu_mips_realize_env(CPUMIPSState *env)\n> mvp_init(env, env->cpu_model);\n> }\n> \n> -MIPSCPU *cpu_mips_init(const char *cpu_model)\n> -{\n> - ObjectClass *oc;\n> - MIPSCPU *cpu;\n> -\n> - oc = cpu_class_by_name(TYPE_MIPS_CPU, cpu_model);\n> - if (oc == NULL) {\n> - return NULL;\n> - }\n> -\n> - cpu = MIPS_CPU(object_new(object_class_get_name(oc)));\n> -\n> - object_property_set_bool(OBJECT(cpu), true, \"realized\", NULL);\n> -\n> - return cpu;\n> -}\n> -\n> bool cpu_supports_cps_smp(const char *cpu_model)\n> {\n> const mips_def_t *def = cpu_mips_find_by_name(cpu_model);","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-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.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 3xy3G56tRYz9sPt\n\tfor ;\n\tThu, 21 Sep 2017 01:15:25 +1000 (AEST)","from localhost ([::1]:48765 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dugig-0002xZ-VG\n\tfor incoming@patchwork.ozlabs.org; Wed, 20 Sep 2017 11:15:23 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:53942)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dufeR-0004KQ-NK\n\tfor qemu-devel@nongnu.org; Wed, 20 Sep 2017 10:06:57 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dufeL-0002LL-LA\n\tfor qemu-devel@nongnu.org; Wed, 20 Sep 2017 10:06:55 -0400","from mx1.redhat.com ([209.132.183.28]:44728)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dufeL-0002Jk-CB\n\tfor qemu-devel@nongnu.org; Wed, 20 Sep 2017 10:06:49 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\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 1B5CE356FD;\n\tWed, 20 Sep 2017 09:21:22 +0000 (UTC)","from nial.brq.redhat.com (unknown [10.43.2.209])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id C8DCE5D9CB;\n\tWed, 20 Sep 2017 09:21:17 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 1B5CE356FD","Date":"Wed, 20 Sep 2017 11:21:16 +0200","From":"Igor Mammedov ","To":"Philippe =?utf-8?q?Mathieu-Daud=C3=A9?= ","Message-ID":"<20170920112116.6885549f@nial.brq.redhat.com>","In-Reply-To":"<20170917232010.14183-7-f4bug@amsat.org>","References":"<20170917232010.14183-1-f4bug@amsat.org>\n\t<20170917232010.14183-7-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.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tWed, 20 Sep 2017 09:21:22 +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 v3 6/6] mips: replace cpu_mips_init() with\n\tcpu_generic_init()","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":"Thomas Huth , James Hogan ,\n\tEduardo Habkost , qemu-devel@nongnu.org, Marcel\n\tApfelbaum , =?utf-8?b?SGVydsOp?=\n\tPoussineau , Yongbok Kim ,\n\tAurelien Jarno ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]