On Fri, Jun 03, 2016 at 11:19:42AM +0530, Bharata B Rao wrote: > Signed-off-by: Bharata B Rao <bhar...@linux.vnet.ibm.com>
Applied to ppc-for-2.7, we were always going to need this at some point.
> ---
> hw/ppc/spapr.c | 22 ++++++++++++++++++++--
> 1 file changed, 20 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 44e401a..30b9731 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -2344,18 +2344,36 @@ static const TypeInfo spapr_machine_info = {
> type_init(spapr_machine_register_##suffix)
>
> /*
> + * pseries-2.7
> + */
> +static void spapr_machine_2_7_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void spapr_machine_2_7_class_options(MachineClass *mc)
> +{
> + /* Defaults for the latest behaviour inherited from the base class */
> +}
> +
> +DEFINE_SPAPR_MACHINE(2_7, "2.7", true);
> +
> +/*
> * pseries-2.6
> */
> +#define SPAPR_COMPAT_2_6 \
> + HW_COMPAT_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 */
> + spapr_machine_2_7_class_options(mc);
> + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_6);
> }
>
> -DEFINE_SPAPR_MACHINE(2_6, "2.6", true);
> +DEFINE_SPAPR_MACHINE(2_6, "2.6", false);
>
> /*
> * pseries-2.5
--
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
