From d45360d93d71578919ae8065a142beb941a900fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Mon, 30 Jul 2018 16:11:31 +0200 Subject: [PATCH] spapr: Add a pseries-3.1 machine type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédric Le Goater Reviewed-by: Greg Kurz Signed-off-by: David Gibson --- hw/ppc/spapr.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index e5d825374e..a732f59205 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4059,19 +4059,38 @@ static const TypeInfo spapr_machine_info = { } \ type_init(spapr_machine_register_##suffix) -/* - * pseries-3.0 + /* + * pseries-3.1 */ -static void spapr_machine_3_0_instance_options(MachineState *machine) +static void spapr_machine_3_1_instance_options(MachineState *machine) { } -static void spapr_machine_3_0_class_options(MachineClass *mc) +static void spapr_machine_3_1_class_options(MachineClass *mc) { /* Defaults for the latest behaviour inherited from the base class */ } -DEFINE_SPAPR_MACHINE(3_0, "3.0", true); +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); +} + +static void spapr_machine_3_0_class_options(MachineClass *mc) +{ + spapr_machine_3_1_class_options(mc); + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_3_0); +} + +DEFINE_SPAPR_MACHINE(3_0, "3.0", false); /* * pseries-2.12