[{"id":1763364,"web_url":"http://patchwork.ozlabs.org/comment/1763364/","msgid":"<20170905132034.GX7570@localhost.localdomain>","list_archive_url":null,"date":"2017-09-05T13:20:34","subject":"Re: [Qemu-devel] [PATCH 1/2] pc: add 2.11 machine type","submitter":{"id":195,"url":"http://patchwork.ozlabs.org/api/people/195/","name":"Eduardo Habkost","email":"ehabkost@redhat.com"},"content":"On Tue, Sep 05, 2017 at 05:30:04PM +0800, Gonglei wrote:\n> CC: \"Michael S. Tsirkin\" \n> CC: Paolo Bonzini \n> CC: Richard Henderson \n> CC: Eduardo Habkost \n> Signed-off-by: Gonglei \n> ---\n> hw/i386/pc_piix.c | 15 ++++++++++++---\n> hw/i386/pc_q35.c | 13 +++++++++++--\n> include/hw/i386/pc.h | 3 +++\n> 3 files changed, 26 insertions(+), 5 deletions(-)\n> \n> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c\n> index 46dfd2c..b03cc04 100644\n> --- a/hw/i386/pc_piix.c\n> +++ b/hw/i386/pc_piix.c\n> @@ -436,21 +436,30 @@ static void pc_i440fx_machine_options(MachineClass *m)\n> m->default_display = \"std\";\n> }\n> \n> -static void pc_i440fx_2_10_machine_options(MachineClass *m)\n> +static void pc_i440fx_2_11_machine_options(MachineClass *m)\n> {\n> pc_i440fx_machine_options(m);\n> m->alias = \"pc\";\n> m->is_default = 1;\n> }\n> \n> +DEFINE_I440FX_MACHINE(v2_11, \"pc-i440fx-2.11\", NULL,\n> + pc_i440fx_2_11_machine_options);\n> +\n> +static void pc_i440fx_2_10_machine_options(MachineClass *m)\n> +{\n> + pc_i440fx_2_11_machine_options(m);\n> + m->is_default = 0;\n> + m->alias = NULL;\n> + SET_MACHINE_COMPAT(m, PC_COMPAT_2_10);\n> +}\n> +\n> DEFINE_I440FX_MACHINE(v2_10, \"pc-i440fx-2.10\", NULL,\n> pc_i440fx_2_10_machine_options);\n> \n> static void pc_i440fx_2_9_machine_options(MachineClass *m)\n> {\n> pc_i440fx_2_10_machine_options(m);\n> - m->is_default = 0;\n> - m->alias = NULL;\n> SET_MACHINE_COMPAT(m, PC_COMPAT_2_9);\n> m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;\n> }\n> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c\n> index 169a214..d6fef8d 100644\n> --- a/hw/i386/pc_q35.c\n> +++ b/hw/i386/pc_q35.c\n> @@ -302,20 +302,29 @@ static void pc_q35_machine_options(MachineClass *m)\n> m->max_cpus = 288;\n> }\n> \n> -static void pc_q35_2_10_machine_options(MachineClass *m)\n> +static void pc_q35_2_11_machine_options(MachineClass *m)\n> {\n> pc_q35_machine_options(m);\n> m->alias = \"q35\";\n> m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;\n> }\n> \n> +DEFINE_Q35_MACHINE(v2_11, \"pc-q35-2.11\", NULL,\n> + pc_q35_2_11_machine_options);\n> +\n> +static void pc_q35_2_10_machine_options(MachineClass *m)\n> +{\n> + pc_q35_2_11_machine_options(m);\n> + m->alias = NULL;\n> + SET_MACHINE_COMPAT(m, PC_COMPAT_2_10);\n> +}\n> +\n> DEFINE_Q35_MACHINE(v2_10, \"pc-q35-2.10\", NULL,\n> pc_q35_2_10_machine_options);\n> \n> static void pc_q35_2_9_machine_options(MachineClass *m)\n> {\n> pc_q35_2_10_machine_options(m);\n> - m->alias = NULL;\n> SET_MACHINE_COMPAT(m, PC_COMPAT_2_9);\n> }\n> \n> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h\n> index d80859b..8226904 100644\n> --- a/include/hw/i386/pc.h\n> +++ b/include/hw/i386/pc.h\n> @@ -369,6 +369,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);\n> int e820_get_num_entries(void);\n> bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);\n> \n> +#define PC_COMPAT_2_10 \\\n> + HW_COMPAT_2_10 \\\n> +\n\nPatch looks good, but I would remove the trailing backslash here.\n\nWith that changed:\n\nReviewed-by: Eduardo Habkost \n\n\n> #define PC_COMPAT_2_9 \\\n> HW_COMPAT_2_9 \\\n> {\\\n> -- \n> 1.8.3.1\n> \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=)","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=ehabkost@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 3xmnsx3R9Xz9t2l\n\tfor ;\n\tTue, 5 Sep 2017 23:40:52 +1000 (AEST)","from localhost ([::1]:59006 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpE5r-0008AB-E4\n\tfor incoming@patchwork.ozlabs.org; Tue, 05 Sep 2017 09:40:43 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:55657)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpE5J-00086Y-Cn\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 09:40:14 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpE59-0004u2-Hk\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 09:40:09 -0400","from mx1.redhat.com ([209.132.183.28]:42728)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpE59-0004tJ-8i\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 09:39:59 -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 36D5C6AAF4;\n\tTue, 5 Sep 2017 13:39:58 +0000 (UTC)","from localhost (ovpn-116-45.gru2.redhat.com [10.97.116.45])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id F042280C60;\n\tTue, 5 Sep 2017 13:39:55 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 36D5C6AAF4","Date":"Tue, 5 Sep 2017 10:20:34 -0300","From":"Eduardo Habkost ","To":"Gonglei ","Message-ID":"<20170905132034.GX7570@localhost.localdomain>","References":"<1504603805-180240-1-git-send-email-arei.gonglei@huawei.com>\n\t<1504603805-180240-2-git-send-email-arei.gonglei@huawei.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<1504603805-180240-2-git-send-email-arei.gonglei@huawei.com>","X-Fnord":"you can see the fnord","User-Agent":"Mutt/1.8.3 (2017-05-23)","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.26]);\n\tTue, 05 Sep 2017 13:39:58 +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 1/2] pc: add 2.11 machine type","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":"weidong.huang@huawei.com, mst@redhat.com, mtosatti@redhat.com,\n\tqemu-devel@nongnu.org, vrozenfe@redhat.com, pbonzini@redhat.com,\n\trth@twiddle.net","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1764446,"web_url":"http://patchwork.ozlabs.org/comment/1764446/","msgid":"<33183CC9F5247A488A2544077AF19020DA3A2524@DGGEMA505-MBX.china.huawei.com>","list_archive_url":null,"date":"2017-09-07T00:58:02","subject":"Re: [Qemu-devel] [PATCH 1/2] pc: add 2.11 machine type","submitter":{"id":35948,"url":"http://patchwork.ozlabs.org/api/people/35948/","name":"Gonglei","email":"arei.gonglei@huawei.com"},"content":"> -----Original Message-----\n> From: Eduardo Habkost [mailto:ehabkost@redhat.com]\n> Sent: Tuesday, September 05, 2017 9:21 PM\n> To: Gonglei (Arei)\n> Cc: qemu-devel@nongnu.org; mst@redhat.com; pbonzini@redhat.com;\n> rth@twiddle.net; mtosatti@redhat.com; vrozenfe@redhat.com;\n> Huangweidong (C)\n> Subject: Re: [PATCH 1/2] pc: add 2.11 machine type\n> \n> On Tue, Sep 05, 2017 at 05:30:04PM +0800, Gonglei wrote:\n> > CC: \"Michael S. Tsirkin\" \n> > CC: Paolo Bonzini \n> > CC: Richard Henderson \n> > CC: Eduardo Habkost \n> > Signed-off-by: Gonglei \n> > ---\n> > hw/i386/pc_piix.c | 15 ++++++++++++---\n> > hw/i386/pc_q35.c | 13 +++++++++++--\n> > include/hw/i386/pc.h | 3 +++\n> > 3 files changed, 26 insertions(+), 5 deletions(-)\n> >\n> > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c\n> > index 46dfd2c..b03cc04 100644\n> > --- a/hw/i386/pc_piix.c\n> > +++ b/hw/i386/pc_piix.c\n> > @@ -436,21 +436,30 @@ static void\n> pc_i440fx_machine_options(MachineClass *m)\n> > m->default_display = \"std\";\n> > }\n> >\n> > -static void pc_i440fx_2_10_machine_options(MachineClass *m)\n> > +static void pc_i440fx_2_11_machine_options(MachineClass *m)\n> > {\n> > pc_i440fx_machine_options(m);\n> > m->alias = \"pc\";\n> > m->is_default = 1;\n> > }\n> >\n> > +DEFINE_I440FX_MACHINE(v2_11, \"pc-i440fx-2.11\", NULL,\n> > + pc_i440fx_2_11_machine_options);\n> > +\n> > +static void pc_i440fx_2_10_machine_options(MachineClass *m)\n> > +{\n> > + pc_i440fx_2_11_machine_options(m);\n> > + m->is_default = 0;\n> > + m->alias = NULL;\n> > + SET_MACHINE_COMPAT(m, PC_COMPAT_2_10);\n> > +}\n> > +\n> > DEFINE_I440FX_MACHINE(v2_10, \"pc-i440fx-2.10\", NULL,\n> > pc_i440fx_2_10_machine_options);\n> >\n> > static void pc_i440fx_2_9_machine_options(MachineClass *m)\n> > {\n> > pc_i440fx_2_10_machine_options(m);\n> > - m->is_default = 0;\n> > - m->alias = NULL;\n> > SET_MACHINE_COMPAT(m, PC_COMPAT_2_9);\n> > m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;\n> > }\n> > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c\n> > index 169a214..d6fef8d 100644\n> > --- a/hw/i386/pc_q35.c\n> > +++ b/hw/i386/pc_q35.c\n> > @@ -302,20 +302,29 @@ static void\n> pc_q35_machine_options(MachineClass *m)\n> > m->max_cpus = 288;\n> > }\n> >\n> > -static void pc_q35_2_10_machine_options(MachineClass *m)\n> > +static void pc_q35_2_11_machine_options(MachineClass *m)\n> > {\n> > pc_q35_machine_options(m);\n> > m->alias = \"q35\";\n> > m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;\n> > }\n> >\n> > +DEFINE_Q35_MACHINE(v2_11, \"pc-q35-2.11\", NULL,\n> > + pc_q35_2_11_machine_options);\n> > +\n> > +static void pc_q35_2_10_machine_options(MachineClass *m)\n> > +{\n> > + pc_q35_2_11_machine_options(m);\n> > + m->alias = NULL;\n> > + SET_MACHINE_COMPAT(m, PC_COMPAT_2_10);\n> > +}\n> > +\n> > DEFINE_Q35_MACHINE(v2_10, \"pc-q35-2.10\", NULL,\n> > pc_q35_2_10_machine_options);\n> >\n> > static void pc_q35_2_9_machine_options(MachineClass *m)\n> > {\n> > pc_q35_2_10_machine_options(m);\n> > - m->alias = NULL;\n> > SET_MACHINE_COMPAT(m, PC_COMPAT_2_9);\n> > }\n> >\n> > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h\n> > index d80859b..8226904 100644\n> > --- a/include/hw/i386/pc.h\n> > +++ b/include/hw/i386/pc.h\n> > @@ -369,6 +369,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);\n> > int e820_get_num_entries(void);\n> > bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);\n> >\n> > +#define PC_COMPAT_2_10 \\\n> > + HW_COMPAT_2_10 \\\n> > +\n> \n> Patch looks good, but I would remove the trailing backslash here.\n> \nOK.\n\n> With that changed:\n> \n> Reviewed-by: Eduardo Habkost \n> \nThanks.","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 3xnhsv5Qxsz9t2v\n\tfor ;\n\tThu, 7 Sep 2017 10:58:56 +1000 (AEST)","from localhost ([::1]:38494 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpl9g-0002Vs-Ct\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 20:58:52 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57069)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpl9K-0002Vc-Q9\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 20:58:32 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpl9H-00030a-O4\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 20:58:30 -0400","from szxga02-in.huawei.com ([45.249.212.188]:4419)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71)\n\t(envelope-from ) id 1dpl9G-0002y0-R3\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 20:58:27 -0400","from 172.30.72.55 (EHLO DGGEMA405-HUB.china.huawei.com)\n\t([172.30.72.55])\n\tby dggrg02-dlp.huawei.com (MOS 4.4.6-GA FastPath queued)\n\twith ESMTP id AUV71964; Thu, 07 Sep 2017 08:58:12 +0800 (CST)","from DGGEMA505-MBX.china.huawei.com ([169.254.1.46]) by\n\tDGGEMA405-HUB.china.huawei.com ([10.3.20.46]) with mapi id\n\t14.03.0301.000; Thu, 7 Sep 2017 08:58:03 +0800"],"From":"\"Gonglei (Arei)\" ","To":"Eduardo Habkost ","Thread-Topic":"[PATCH 1/2] pc: add 2.11 machine type","Thread-Index":"AQHTJimZkO1YcbJYjkqwo9O1xSn52aKlwRIAgALbAoA=","Date":"Thu, 7 Sep 2017 00:58:02 +0000","Message-ID":"<33183CC9F5247A488A2544077AF19020DA3A2524@DGGEMA505-MBX.china.huawei.com>","References":"<1504603805-180240-1-git-send-email-arei.gonglei@huawei.com>\n\t<1504603805-180240-2-git-send-email-arei.gonglei@huawei.com>\n\t<20170905132034.GX7570@localhost.localdomain>","In-Reply-To":"<20170905132034.GX7570@localhost.localdomain>","Accept-Language":"zh-CN, en-US","Content-Language":"zh-CN","X-MS-Has-Attach":"","X-MS-TNEF-Correlator":"","x-originating-ip":"[10.177.18.62]","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"quoted-printable","MIME-Version":"1.0","X-CFilter-Loop":"Reflected","X-Mirapoint-Virus-RAPID-Raw":"score=unknown(0),\n\trefid=str=0001.0A090204.59B099A7.000C, ss=1, re=0.000, recu=0.000,\n\treip=0.000, cl=1, cld=1, fgs=0, ip=169.254.1.46,\n\tso=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32","X-Mirapoint-Loop-Id":"95aee1981706d19a4b1a27c65975fa45","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic]\n\t[fuzzy]","X-Received-From":"45.249.212.188","Subject":"Re: [Qemu-devel] [PATCH 1/2] pc: add 2.11 machine type","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":"\"Huangweidong \\(C\\)\" ,\n\t\"mst@redhat.com\" ,\n\t\"mtosatti@redhat.com\" ,\n\t\"qemu-devel@nongnu.org\" ,\n\t\"vrozenfe@redhat.com\" ,\n\t\"pbonzini@redhat.com\" ,\n\t\"rth@twiddle.net\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]