From 3fa14fbe1310e8980072447ba405571be7a78a5d Mon Sep 17 00:00:00 2001 From: David Gibson Date: Tue, 7 Mar 2017 11:02:28 +1100 Subject: [PATCH] pseries: Add pseries-2.10 machine type Signed-off-by: David Gibson --- hw/ppc/spapr.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 35db949dbc..de5db75b68 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3158,18 +3158,37 @@ static const TypeInfo spapr_machine_info = { type_init(spapr_machine_register_##suffix) /* - * pseries-2.9 + * pseries-2.10 */ -static void spapr_machine_2_9_instance_options(MachineState *machine) +static void spapr_machine_2_10_instance_options(MachineState *machine) { } -static void spapr_machine_2_9_class_options(MachineClass *mc) +static void spapr_machine_2_10_class_options(MachineClass *mc) { /* Defaults for the latest behaviour inherited from the base class */ } -DEFINE_SPAPR_MACHINE(2_9, "2.9", true); +DEFINE_SPAPR_MACHINE(2_10, "2.10", true); + +/* + * pseries-2.9 + */ +#define SPAPR_COMPAT_2_9 \ + HW_COMPAT_2_9 + +static void spapr_machine_2_9_instance_options(MachineState *machine) +{ + spapr_machine_2_10_instance_options(machine); +} + +static void spapr_machine_2_9_class_options(MachineClass *mc) +{ + spapr_machine_2_10_class_options(mc); + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_9); +} + +DEFINE_SPAPR_MACHINE(2_9, "2.9", false); /* * pseries-2.8