Re: [PATCH v5 3/9] ppc/pnv: New powernv10-rainier machine type

[Cédric Le Goater]

On 11/21/23 20:09, Glenn Miles wrote:
> Create a new powernv machine type, powernv10-rainier, that
> will contain rainier-specific devices.
>
> Signed-off-by: Glenn Miles <milesg@linux.vnet.ibm.com>


Reviewed-by: Cédric Le Goater <clg@kaod.org>

Thanks,

C.


> ---
>
> Changes from previous version:
>    - Formatting changes
>    - Capitalized "Rainier" in machine description string
>    - Changed powernv10-rainier parent to MACHINE_TYPE_NAME("powernv10")
>
>   hw/ppc/pnv.c | 24 ++++++++++++++++++++++--
>   1 file changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index 0297871bdd..08704ce695 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -2251,7 +2251,7 @@ static void pnv_machine_power9_class_init(ObjectClass 
> *oc, void *data)
>       machine_class_allow_dynamic_sysbus_dev(mc, TYPE_PNV_PHB);
>   }
>   
> -static void pnv_machine_power10_class_init(ObjectClass *oc, void *data)
> +static void pnv_machine_p10_common_class_init(ObjectClass *oc, void *data)
>   {
>       MachineClass *mc = MACHINE_CLASS(oc);
>       PnvMachineClass *pmc = PNV_MACHINE_CLASS(oc);
> @@ -2263,7 +2263,6 @@ static void pnv_machine_power10_class_init(ObjectClass 
> *oc, void *data)
>           { TYPE_PNV_PHB_ROOT_PORT, "version", "5" },
>       };
>   
> -    mc->desc = "IBM PowerNV (Non-Virtualized) POWER10";
>       mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power10_v2.0");
>       compat_props_add(mc->compat_props, phb_compat, G_N_ELEMENTS(phb_compat));
>   
> @@ -2276,6 +2275,22 @@ static void pnv_machine_power10_class_init(ObjectClass *oc, void *data)
>       machine_class_allow_dynamic_sysbus_dev(mc, TYPE_PNV_PHB);
>   }
>   
> +static void pnv_machine_power10_class_init(ObjectClass *oc, void *data)
> +{
> +    MachineClass *mc = MACHINE_CLASS(oc);
> +
> +    pnv_machine_p10_common_class_init(oc, data);
> +    mc->desc = "IBM PowerNV (Non-Virtualized) POWER10";
> +}
> +
> +static void pnv_machine_p10_rainier_class_init(ObjectClass *oc, void *data)
> +{
> +    MachineClass *mc = MACHINE_CLASS(oc);
> +
> +    pnv_machine_p10_common_class_init(oc, data);
> +    mc->desc = "IBM PowerNV (Non-Virtualized) POWER10 Rainier";
> +}
> +
>   static bool pnv_machine_get_hb(Object *obj, Error **errp)
>   {
>       PnvMachineState *pnv = PNV_MACHINE(obj);
> @@ -2381,6 +2396,11 @@ static void pnv_machine_class_init(ObjectClass *oc, void 
> *data)
>       }
>   
>   static const TypeInfo types[] = {
> +    {
> +        .name          = MACHINE_TYPE_NAME("powernv10-rainier"),
> +        .parent        = MACHINE_TYPE_NAME("powernv10"),
> +        .class_init    = pnv_machine_p10_rainier_class_init,
> +    },
>       {
>           .name          = MACHINE_TYPE_NAME("powernv10"),
>           .parent        = TYPE_PNV_MACHINE,