On Wed, Oct 12, 2016 at 06:13:53PM -0500, Michael Roth wrote: > Rather than machine instances having backward-compatible option > defaults that need to be repeatedly re-enabled for every new machine > type we introduce, we set the defaults appropriate for newer machine > types, then add code to explicitly disable instance options as needed > to maintain compatibility with older machine types. > > Currently pseries-2.5 does not inherit from pseries-2.6 in this > fashion, which is okay at the moment since we do not have any > instance compatibility options for pseries-2.6+ currently. > > We will make use of this in future patches though, so fix it here. > > Signed-off-by: Michael Roth <mdr...@linux.vnet.ibm.com>
This patch stands on its own, so I've applied it to ppc-for-2.8 (and
also extended it to make 2_7 inherit from 2_8).
> ---
> hw/ppc/spapr.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 3b2a459..f8cde92 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -2544,6 +2544,7 @@ DEFINE_SPAPR_MACHINE(2_7, "2.7", false);
>
> static void spapr_machine_2_6_instance_options(MachineState *machine)
> {
> + spapr_machine_2_7_instance_options(machine);
> }
>
> static void spapr_machine_2_6_class_options(MachineClass *mc)
> @@ -2568,6 +2569,7 @@ DEFINE_SPAPR_MACHINE(2_6, "2.6", false);
>
> static void spapr_machine_2_5_instance_options(MachineState *machine)
> {
> + spapr_machine_2_6_instance_options(machine);
> }
>
> static void spapr_machine_2_5_class_options(MachineClass *mc)
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
