From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk9On-00007P-EW for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:43:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fk9Ok-0006DN-Rj for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:43:49 -0400 Received: from 3.mo6.mail-out.ovh.net ([178.33.253.26]:40818) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fk9Ok-0006D2-KB for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:43:46 -0400 Received: from player729.ha.ovh.net (unknown [10.109.143.220]) by mo6.mail-out.ovh.net (Postfix) with ESMTP id 00F58172262 for ; Mon, 30 Jul 2018 16:43:44 +0200 (CEST) Date: Mon, 30 Jul 2018 16:43:35 +0200 From: Greg Kurz Message-ID: <20180730164335.48dfef03@bahia.lan> In-Reply-To: <20180730141134.31153-2-clg@kaod.org> References: <20180730141134.31153-1-clg@kaod.org> <20180730141134.31153-2-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v6 1/4] spapr: Add a pseries-3.1 machine type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?Q8OpZHJpYw==?= Le Goater Cc: David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org On Mon, 30 Jul 2018 16:11:31 +0200 C=C3=A9dric Le Goater wrote: > Signed-off-by: C=C3=A9dric Le Goater > --- Reviewed-by: Greg Kurz > include/hw/compat.h | 3 +++ > hw/ppc/spapr.c | 23 +++++++++++++++++++++-- > 2 files changed, 24 insertions(+), 2 deletions(-) >=20 > diff --git a/include/hw/compat.h b/include/hw/compat.h > index c08f4040bb80..6f4d5fc64704 100644 > --- a/include/hw/compat.h > +++ b/include/hw/compat.h > @@ -1,6 +1,9 @@ > #ifndef HW_COMPAT_H > #define HW_COMPAT_H > =20 > +#define HW_COMPAT_3_0 \ > + /* empty */ > + > #define HW_COMPAT_2_12 \ > {\ > .driver =3D "migration",\ > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 421b2dd09b51..3c72173c7e0f 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4058,19 +4058,38 @@ static const TypeInfo spapr_machine_info =3D { > } \ > type_init(spapr_machine_register_##suffix) > =20 > + /* > + * pseries-3.1 > + */ > +static void spapr_machine_3_1_instance_options(MachineState *machine) > +{ > +} > + > +static void spapr_machine_3_1_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(3_1, "3.1", true); > + > /* > * pseries-3.0 > */ > +#define SPAPR_COMPAT_3_0 \ > + HW_COMPAT_3_0 > + > static void spapr_machine_3_0_instance_options(MachineState *machine) > { > + spapr_machine_3_1_instance_options(machine); > } > =20 > static void spapr_machine_3_0_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_3_1_class_options(mc); > + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_3_0); > } > =20 > -DEFINE_SPAPR_MACHINE(3_0, "3.0", true); > +DEFINE_SPAPR_MACHINE(3_0, "3.0", false); > =20 > /* > * pseries-2.12