From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55657) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpE5J-00086Y-Cn for qemu-devel@nongnu.org; Tue, 05 Sep 2017 09:40:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpE59-0004u2-Hk for qemu-devel@nongnu.org; Tue, 05 Sep 2017 09:40:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42728) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpE59-0004tJ-8i for qemu-devel@nongnu.org; Tue, 05 Sep 2017 09:39:59 -0400 Date: Tue, 5 Sep 2017 10:20:34 -0300 From: Eduardo Habkost Message-ID: <20170905132034.GX7570@localhost.localdomain> References: <1504603805-180240-1-git-send-email-arei.gonglei@huawei.com> <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> Subject: Re: [Qemu-devel] [PATCH 1/2] pc: add 2.11 machine type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gonglei Cc: qemu-devel@nongnu.org, mst@redhat.com, pbonzini@redhat.com, rth@twiddle.net, mtosatti@redhat.com, vrozenfe@redhat.com, weidong.huang@huawei.com On Tue, Sep 05, 2017 at 05:30:04PM +0800, Gonglei wrote: > CC: "Michael S. Tsirkin" > CC: Paolo Bonzini > CC: Richard Henderson > CC: Eduardo Habkost > Signed-off-by: Gonglei > --- > hw/i386/pc_piix.c | 15 ++++++++++++--- > hw/i386/pc_q35.c | 13 +++++++++++-- > include/hw/i386/pc.h | 3 +++ > 3 files changed, 26 insertions(+), 5 deletions(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 46dfd2c..b03cc04 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -436,21 +436,30 @@ static void pc_i440fx_machine_options(MachineClass *m) > m->default_display = "std"; > } > > -static void pc_i440fx_2_10_machine_options(MachineClass *m) > +static void pc_i440fx_2_11_machine_options(MachineClass *m) > { > pc_i440fx_machine_options(m); > m->alias = "pc"; > m->is_default = 1; > } > > +DEFINE_I440FX_MACHINE(v2_11, "pc-i440fx-2.11", NULL, > + pc_i440fx_2_11_machine_options); > + > +static void pc_i440fx_2_10_machine_options(MachineClass *m) > +{ > + pc_i440fx_2_11_machine_options(m); > + m->is_default = 0; > + m->alias = NULL; > + SET_MACHINE_COMPAT(m, PC_COMPAT_2_10); > +} > + > DEFINE_I440FX_MACHINE(v2_10, "pc-i440fx-2.10", NULL, > pc_i440fx_2_10_machine_options); > > static void pc_i440fx_2_9_machine_options(MachineClass *m) > { > pc_i440fx_2_10_machine_options(m); > - m->is_default = 0; > - m->alias = NULL; > SET_MACHINE_COMPAT(m, PC_COMPAT_2_9); > m->numa_auto_assign_ram = numa_legacy_auto_assign_ram; > } > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 169a214..d6fef8d 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -302,20 +302,29 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus = 288; > } > > -static void pc_q35_2_10_machine_options(MachineClass *m) > +static void pc_q35_2_11_machine_options(MachineClass *m) > { > pc_q35_machine_options(m); > m->alias = "q35"; > m->numa_auto_assign_ram = numa_legacy_auto_assign_ram; > } > > +DEFINE_Q35_MACHINE(v2_11, "pc-q35-2.11", NULL, > + pc_q35_2_11_machine_options); > + > +static void pc_q35_2_10_machine_options(MachineClass *m) > +{ > + pc_q35_2_11_machine_options(m); > + m->alias = NULL; > + SET_MACHINE_COMPAT(m, PC_COMPAT_2_10); > +} > + > DEFINE_Q35_MACHINE(v2_10, "pc-q35-2.10", NULL, > pc_q35_2_10_machine_options); > > static void pc_q35_2_9_machine_options(MachineClass *m) > { > pc_q35_2_10_machine_options(m); > - m->alias = NULL; > SET_MACHINE_COMPAT(m, PC_COMPAT_2_9); > } > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index d80859b..8226904 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -369,6 +369,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); > int e820_get_num_entries(void); > bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); > > +#define PC_COMPAT_2_10 \ > + HW_COMPAT_2_10 \ > + Patch looks good, but I would remove the trailing backslash here. With that changed: Reviewed-by: Eduardo Habkost > #define PC_COMPAT_2_9 \ > HW_COMPAT_2_9 \ > {\ > -- > 1.8.3.1 > > -- Eduardo