diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2015-12-07 14:28:15 +1100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2016-01-11 15:29:05 +1100 |
| commit | 4b23699c828d19360d6ca5b74036573decb62194 (patch) | |
| tree | cd70454e225943bfac0e53cb376cc848c8bed75f /hw | |
| parent | fccbc785003f4575a3f22a4d230f9aaa1327788e (diff) | |
| download | qemu-4b23699c828d19360d6ca5b74036573decb62194.tar.gz qemu-4b23699c828d19360d6ca5b74036573decb62194.tar.bz2 qemu-4b23699c828d19360d6ca5b74036573decb62194.zip | |
pseries: Add pseries-2.6 machine type
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ppc/spapr.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 8b8eb188b7..7f6b118bfb 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2337,18 +2337,36 @@ static const TypeInfo spapr_machine_info = { machine_init(spapr_machine_register_##suffix) /* + * pseries-2.6 + */ +static void spapr_machine_2_6_instance_options(MachineState *machine) +{ +} + +static void spapr_machine_2_6_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(2_6, "2.6", true); + +/* * pseries-2.5 */ +#define SPAPR_COMPAT_2_5 \ + HW_COMPAT_2_5 + static void spapr_machine_2_5_instance_options(MachineState *machine) { } static void spapr_machine_2_5_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_2_6_class_options(mc); + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_5); } -DEFINE_SPAPR_MACHINE(2_5, "2.5", true); +DEFINE_SPAPR_MACHINE(2_5, "2.5", false); /* * pseries-2.4 |