From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44628) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7SKJ-0004wz-Tk for qemu-devel@nongnu.org; Mon, 30 May 2016 14:54:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b7SKG-0000Nb-Q1 for qemu-devel@nongnu.org; Mon, 30 May 2016 14:54:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44212) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7SKG-0000NW-HU for qemu-devel@nongnu.org; Mon, 30 May 2016 14:54:08 -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 E814B10B85F for ; Mon, 30 May 2016 18:54:07 +0000 (UTC) References: <1463496205-251412-1-git-send-email-imammedo@redhat.com> <1463496205-251412-19-git-send-email-imammedo@redhat.com> From: Marcel Apfelbaum Message-ID: <574C8C47.7020202@redhat.com> Date: Mon, 30 May 2016 21:53:59 +0300 MIME-Version: 1.0 In-Reply-To: <1463496205-251412-19-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 18/33] pc: add 2.7 machine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov , qemu-devel@nongnu.org Cc: mst@redhat.com, rkrcmar@redhat.com, ehabkost@redhat.com, drjones@redhat.com, armbru@redhat.com On 05/17/2016 05:43 PM, Igor Mammedov wrote: > Signed-off-by: Igor Mammedov Eduardo also posted a patch for 2.7 machine. Thanks, Marcel > --- > hw/i386/pc_piix.c | 16 +++++++++++++--- > hw/i386/pc_q35.c | 13 +++++++++++-- > include/hw/compat.h | 3 +++ > include/hw/i386/pc.h | 4 ++++ > 4 files changed, 31 insertions(+), 5 deletions(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 7f50116..cdbdd69 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/compat.h b/include/hw/compat.h > index a5dbbf8..636befe 100644 > --- a/include/hw/compat.h > +++ b/include/hw/compat.h > @@ -1,6 +1,9 @@ > #ifndef HW_COMPAT_H > #define HW_COMPAT_H > > +#define HW_COMPAT_2_6 \ > + /* empty */ > + > #define HW_COMPAT_2_5 \ > {\ > .driver = "isa-fdc",\ > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 96f0b66..f1e40ae 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 > > #define PC_COMPAT_2_4 \ >