From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55489) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCsWG-0002Za-9l for qemu-devel@nongnu.org; Tue, 14 Jun 2016 13:52:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCsWA-0005nR-Cy for qemu-devel@nongnu.org; Tue, 14 Jun 2016 13:52:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46344) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCsWA-0005nJ-55 for qemu-devel@nongnu.org; Tue, 14 Jun 2016 13:52:50 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AC494C04B300 for ; Tue, 14 Jun 2016 17:52:49 +0000 (UTC) Date: Tue, 14 Jun 2016 20:52:48 +0300 From: "Michael S. Tsirkin" Message-ID: <20160614205239-mutt-send-email-mst@redhat.com> References: <1464375335-12826-1-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1464375335-12826-1-git-send-email-ehabkost@redhat.com> Subject: Re: [Qemu-devel] [PATCH] pc: Add 2.7 machine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: qemu-devel@nongnu.org, Radim =?utf-8?B?S3LEjW3DocWZ?= , Igor Mammedov On Fri, May 27, 2016 at 03:55:35PM -0300, Eduardo Habkost wrote: > From: Igor Mammedov > > Signed-off-by: Igor Mammedov > Reviewed-by: Eduardo Habkost > Signed-off-by: Eduardo Habkost > --- Reviewed-by: Michael S. Tsirkin > This is blocking some patches from getting included (e.g. the > CPUID[0xB] patch from Radim), so I'm submitting Igor's RFC as > [PATCH]. > > I will add it to my x86-next queue so I can queue x86 patches > that depend on it. But I plan to wait until it gets merged > through the PC tree and rebase before sending a x86 pull request. > --- > hw/i386/pc_piix.c | 16 +++++++++++++--- > hw/i386/pc_q35.c | 13 +++++++++++-- > include/hw/i386/pc.h | 4 ++++ > 3 files changed, 28 insertions(+), 5 deletions(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 24e7042..d3bbe8a 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -416,13 +416,25 @@ static void pc_i440fx_machine_options(MachineClass *m) > m->default_display = "std"; > } > > -static void pc_i440fx_2_6_machine_options(MachineClass *m) > +static void pc_i440fx_2_7_machine_options(MachineClass *m) > { > pc_i440fx_machine_options(m); > m->alias = "pc"; > m->is_default = 1; > } > > +DEFINE_I440FX_MACHINE(v2_7, "pc-i440fx-2.7", NULL, > + pc_i440fx_2_7_machine_options); > + > + > +static void pc_i440fx_2_6_machine_options(MachineClass *m) > +{ > + pc_i440fx_2_7_machine_options(m); > + m->is_default = 0; > + m->alias = NULL; > + SET_MACHINE_COMPAT(m, PC_COMPAT_2_6); > +} > + > DEFINE_I440FX_MACHINE(v2_6, "pc-i440fx-2.6", NULL, > pc_i440fx_2_6_machine_options); > > @@ -431,8 +443,6 @@ static void pc_i440fx_2_5_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_2_6_machine_options(m); > - m->alias = NULL; > - m->is_default = 0; > pcmc->save_tsc_khz = false; > m->legacy_fw_cfg_order = 1; > SET_MACHINE_COMPAT(m, PC_COMPAT_2_5); > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 04aae89..4787df1 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -283,12 +283,22 @@ static void pc_q35_machine_options(MachineClass *m) > m->no_floppy = 1; > } > > -static void pc_q35_2_6_machine_options(MachineClass *m) > +static void pc_q35_2_7_machine_options(MachineClass *m) > { > pc_q35_machine_options(m); > m->alias = "q35"; > } > > +DEFINE_Q35_MACHINE(v2_7, "pc-q35-2.7", NULL, > + pc_q35_2_7_machine_options); > + > +static void pc_q35_2_6_machine_options(MachineClass *m) > +{ > + pc_q35_2_7_machine_options(m); > + m->alias = NULL; > + SET_MACHINE_COMPAT(m, PC_COMPAT_2_6); > +} > + > DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL, > pc_q35_2_6_machine_options); > > @@ -296,7 +306,6 @@ static void pc_q35_2_5_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_2_6_machine_options(m); > - m->alias = NULL; > pcmc->save_tsc_khz = false; > m->legacy_fw_cfg_order = 1; > SET_MACHINE_COMPAT(m, PC_COMPAT_2_5); > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 9ca2309..ca23609 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -356,7 +356,11 @@ 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_6 \ > + HW_COMPAT_2_6 > + > #define PC_COMPAT_2_5 \ > + PC_COMPAT_2_6 \ > HW_COMPAT_2_5 > > /* Helper for setting model-id for CPU models that changed model-id > -- > 2.5.5