From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbWbJ-0000Az-3R for qemu-devel@nongnu.org; Mon, 14 Sep 2015 12:27:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbWbF-00065o-Tc for qemu-devel@nongnu.org; Mon, 14 Sep 2015 12:27:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42410) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbWbF-00064U-Mw for qemu-devel@nongnu.org; Mon, 14 Sep 2015 12:27:25 -0400 Date: Mon, 14 Sep 2015 18:27:22 +0200 From: Igor Mammedov Message-ID: <20150914182722.2d05a8fa@nial.brq.redhat.com> In-Reply-To: <1442241165-27983-4-git-send-email-ehabkost@redhat.com> References: <1442241165-27983-1-git-send-email-ehabkost@redhat.com> <1442241165-27983-4-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 3/3] pc: Introduce pc-*-2.5 machine classes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: Paolo Bonzini , Jason Wang , Richard Henderson , qemu-devel@nongnu.org, "Michael S. Tsirkin" On Mon, 14 Sep 2015 11:32:45 -0300 Eduardo Habkost wrote: > Introduce pc-*-2.5 machine classes, and add HW_COMPAT_2_4/PC_COMPAT_2_4 > macros that will allow pc-*-2.4 compat properties to be added. > > Signed-off-by: Eduardo Habkost Reviewed-by: Igor Mammedov > --- > Changes v1 -> v2: > * Trivial rebase to qemu.git master > > Changes v2 -> v3: > * Move broken_reserved_end=true to pc_*_2_4_machine_options() > Reported-by: Igor Mammedov > * Improved commit message > --- > hw/i386/pc_piix.c | 18 +++++++++++++++--- > hw/i386/pc_q35.c | 14 ++++++++++++-- > include/hw/compat.h | 3 +++ > include/hw/i386/pc.h | 4 ++++ > 4 files changed, 34 insertions(+), 5 deletions(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 2d9df7c..3ffb05f 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -464,15 +464,27 @@ static void pc_i440fx_machine_options(MachineClass *m) > m->default_display = "std"; > } > > -static void pc_i440fx_2_4_machine_options(MachineClass *m) > +static void pc_i440fx_2_5_machine_options(MachineClass *m) > { > - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > - pcmc->broken_reserved_end = true; > m->alias = "pc"; > m->is_default = 1; > } > > +DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL, > + pc_i440fx_2_5_machine_options); > + > + > +static void pc_i440fx_2_4_machine_options(MachineClass *m) > +{ > + PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > + pc_i440fx_2_5_machine_options(m); > + m->alias = NULL; > + m->is_default = 0; > + pcmc->broken_reserved_end = true; > + SET_MACHINE_COMPAT(m, PC_COMPAT_2_4); > +} > + > DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL, > pc_i440fx_2_4_machine_options) > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 966eedb..1b7d3b6 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -370,12 +370,22 @@ static void pc_q35_machine_options(MachineClass *m) > m->no_tco = 0; > } > > +static void pc_q35_2_5_machine_options(MachineClass *m) > +{ > + pc_q35_machine_options(m); > + m->alias = "q35"; > +} > + > +DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL, > + pc_q35_2_5_machine_options); > + > static void pc_q35_2_4_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > - pc_q35_machine_options(m); > + pc_q35_2_5_machine_options(m); > + m->alias = NULL; > pcmc->broken_reserved_end = true; > - m->alias = "q35"; > + SET_MACHINE_COMPAT(m, PC_COMPAT_2_4); > } > > DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL, > diff --git a/include/hw/compat.h b/include/hw/compat.h > index 94c8097..095de5d 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_4 \ > + /* empty */ > + > #define HW_COMPAT_2_3 \ > {\ > .driver = "virtio-blk-pci",\ > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 3e002c9..6896328 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -291,7 +291,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_4 \ > + HW_COMPAT_2_4 > + > #define PC_COMPAT_2_3 \ > + PC_COMPAT_2_4 \ > HW_COMPAT_2_3 \ > {\ > .driver = TYPE_X86_CPU,\