Re: [Qemu-ppc] [RFC 9/9] spapr: Add pseries-2.6 machine type

[Thomas Huth]

On 30/11/15 09:51, David Gibson wrote:
> Signed-off-by: David Gibson <address@hidden>
> ---
>  hw/ppc/spapr.c | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 3d31fe7..f680497 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -2334,9 +2334,9 @@ static const TypeInfo spapr_machine_info = {
>      machine_init(spapr_machine_register_##suffix)
>  
>  /*
> - * pseries-2.5
> + * pseries-2.6
>   */
> -static void spapr_machine_2_5_class_compat(MachineClass *mc)
> +static void spapr_machine_2_6_class_compat(MachineClass *mc)
>  {
>      sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
>  
> @@ -2344,7 +2344,17 @@ static void 
> spapr_machine_2_5_class_compat(MachineClass *mc)
>      mc->desc = "pSeries Logical Partition (PAPR compliant)";
>  }
>  
> -DEFINE_SPAPR_MACHINE(2_5, "2.5", NULL, true);
> +DEFINE_SPAPR_MACHINE(2_6, "2.6", NULL, true);
> +
> +/*
> + * pseries-2.5
> + */
> +static void spapr_machine_2_5_class_compat(MachineClass *mc)
> +{
> +    spapr_machine_2_6_class_compat(mc);
> +}
> +
> +DEFINE_SPAPR_MACHINE(2_5, "2.5", NULL, false);
>  
>  /*
>   * pseries-2.4

Reviewed-by: Thomas Huth <address@hidden>