On Sun, 2018-12-09 at 20:46 +0100, Cédric Le Goater wrote: > Signed-off-by: Cédric Le Goater <c...@kaod.org> > ---
If you're going to do that, can we include large decrementer in there too ? (patches from Suraj in my tree but they night need a bit of massaging). > include/hw/compat.h | 3 +++ > hw/ppc/spapr.c | 25 ++++++++++++++++++++++--- > 2 files changed, 25 insertions(+), 3 deletions(-) > > diff --git a/include/hw/compat.h b/include/hw/compat.h > index 6f4d5fc64704..70958328fe7a 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_3_1 \ > + /* empty */ > + > #define HW_COMPAT_3_0 \ > /* empty */ > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index fa41927d95dd..4012ebd794a4 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -3971,19 +3971,38 @@ static const TypeInfo spapr_machine_info = { > } \ > type_init(spapr_machine_register_##suffix) > > - /* > +/* > + * pseries-4.0 > + */ > +static void spapr_machine_4_0_instance_options(MachineState *machine) > +{ > +} > + > +static void spapr_machine_4_0_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(4_0, "4.0", true); > + > +/* > * pseries-3.1 > */ > +#define SPAPR_COMPAT_3_1 \ > + HW_COMPAT_3_1 > + > static void spapr_machine_3_1_instance_options(MachineState *machine) > { > + spapr_machine_4_0_instance_options(machine); > } > > static void spapr_machine_3_1_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_4_0_class_options(mc); > + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_3_1); > } > > -DEFINE_SPAPR_MACHINE(3_1, "3.1", true); > +DEFINE_SPAPR_MACHINE(3_1, "3.1", false); > > /* > * pseries-3.0