From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIERs-0003H5-Pb for qemu-devel@nongnu.org; Thu, 01 Nov 2018 10:59:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIERn-0005MP-Nz for qemu-devel@nongnu.org; Thu, 01 Nov 2018 10:59:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8594) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gIERn-0005Lv-5C for qemu-devel@nongnu.org; Thu, 01 Nov 2018 10:59:47 -0400 Date: Thu, 1 Nov 2018 15:59:37 +0100 From: Igor Mammedov Message-ID: <20181101155937.480f4eb4@redhat.com> In-Reply-To: <20181030150453.9344-10-marcandre.lureau@redhat.com> References: <20181030150453.9344-1-marcandre.lureau@redhat.com> <20181030150453.9344-10-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 09/10] hw/i386: add pc-i440fx-3.1 & pc-q35-3.1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?TWFyYy1BbmRyw6k=?= Lureau Cc: qemu-devel@nongnu.org, Paolo Bonzini , Amit Shah , Eduardo Habkost , Marcel Apfelbaum , dgilbert@redhat.com, Richard Henderson , Andreas =?UTF-8?B?RsOkcmJlcg==?= , "Michael S. Tsirkin" , Artyom Tarasenko , Mark Cave-Ayland On Tue, 30 Oct 2018 19:04:52 +0400 Marc-Andr=C3=A9 Lureau wrote: > The following patch is going to add compatiblity parameters. >=20 > Signed-off-by: Marc-Andr=C3=A9 Lureau > Reviewed-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov > --- > include/hw/i386/pc.h | 2 +- > hw/i386/pc_piix.c | 15 ++++++++++++--- > hw/i386/pc_q35.c | 13 +++++++++++-- > 3 files changed, 24 insertions(+), 6 deletions(-) >=20 > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index dfe6746692..67ff516d61 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -300,7 +300,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64= _t *); > .driver =3D TYPE_X86_CPU,\ > .property =3D "x-hv-synic-kvm-only",\ > .value =3D "on",\ > - } > + }, > =20 > #define PC_COMPAT_2_12 \ > HW_COMPAT_2_12 \ > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index dc09466b3e..7092d6d13f 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -428,21 +428,30 @@ static void pc_i440fx_machine_options(MachineClass = *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); > } > =20 > -static void pc_i440fx_3_0_machine_options(MachineClass *m) > +static void pc_i440fx_3_1_machine_options(MachineClass *m) > { > pc_i440fx_machine_options(m); > m->alias =3D "pc"; > m->is_default =3D 1; > } > =20 > +DEFINE_I440FX_MACHINE(v3_1, "pc-i440fx-3.1", NULL, > + pc_i440fx_3_1_machine_options); > + > +static void pc_i440fx_3_0_machine_options(MachineClass *m) > +{ > + pc_i440fx_3_1_machine_options(m); > + m->is_default =3D 0; > + m->alias =3D NULL; > + SET_MACHINE_COMPAT(m, PC_COMPAT_3_0); > +} > + > DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL, > pc_i440fx_3_0_machine_options); > =20 > static void pc_i440fx_2_12_machine_options(MachineClass *m) > { > pc_i440fx_3_0_machine_options(m); > - m->is_default =3D 0; > - m->alias =3D NULL; > SET_MACHINE_COMPAT(m, PC_COMPAT_2_12); > } > =20 > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 532241e3f8..4702bb13c4 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -311,19 +311,28 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus =3D 288; > } > =20 > -static void pc_q35_3_0_machine_options(MachineClass *m) > +static void pc_q35_3_1_machine_options(MachineClass *m) > { > pc_q35_machine_options(m); > m->alias =3D "q35"; > } > =20 > +DEFINE_Q35_MACHINE(v3_1, "pc-q35-3.1", NULL, > + pc_q35_3_1_machine_options); > + > +static void pc_q35_3_0_machine_options(MachineClass *m) > +{ > + pc_q35_3_1_machine_options(m); > + m->alias =3D NULL; > + SET_MACHINE_COMPAT(m, PC_COMPAT_3_0); > +} > + > DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL, > pc_q35_3_0_machine_options); > =20 > static void pc_q35_2_12_machine_options(MachineClass *m) > { > pc_q35_3_0_machine_options(m); > - m->alias =3D NULL; > SET_MACHINE_COMPAT(m, PC_COMPAT_2_12); > } > =20