diff options
| author | David Gibson | 2016-12-08 06:39:18 +0100 |
|---|---|---|
| committer | David Gibson | 2017-01-31 00:10:13 +0100 |
| commit | fa325e6cbf343eba3a5ad8294929e503187ec0b9 (patch) | |
| tree | ae57c2b5b238227eafd9fb2b9ce9b676a8f505fe | |
| parent | prep: do not use global variable to access nvram (diff) | |
| download | qemu-fa325e6cbf343eba3a5ad8294929e503187ec0b9.tar.gz qemu-fa325e6cbf343eba3a5ad8294929e503187ec0b9.tar.xz qemu-fa325e6cbf343eba3a5ad8294929e503187ec0b9.zip | |
pseries: Add pseries-2.9 machine type
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
| -rw-r--r-- | hw/ppc/spapr.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f2edbd056d..a17560972c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2774,18 +2774,37 @@ static const TypeInfo spapr_machine_info = { type_init(spapr_machine_register_##suffix) /* + * pseries-2.9 + */ +static void spapr_machine_2_9_instance_options(MachineState *machine) +{ +} + +static void spapr_machine_2_9_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(2_9, "2.9", true); + +/* * pseries-2.8 */ +#define SPAPR_COMPAT_2_8 \ + HW_COMPAT_2_8 + static void spapr_machine_2_8_instance_options(MachineState *machine) { + spapr_machine_2_9_instance_options(machine); } static void spapr_machine_2_8_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_2_9_class_options(mc); + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_8); } -DEFINE_SPAPR_MACHINE(2_8, "2.8", true); +DEFINE_SPAPR_MACHINE(2_8, "2.8", false); /* * pseries-2.7 |