Re: [PATCH v2 07/30] hw/arm/raspi: Make machines children of abstract RaspiMachineClass

[BALATON Zoltan]

On Thu, 6 Feb 2020, Philippe Mathieu-Daudé wrote:
> QOM'ify RaspiMachineState. Now machines inherite of RaspiMachineClass.

Typo: inherite -> inherit

Regards,
BALATON Zoltan


> Cc: Igor Mammedov <address@hidden>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> hw/arm/raspi.c | 56 +++++++++++++++++++++++++++++++++++++++++++-------
> 1 file changed, 49 insertions(+), 7 deletions(-)
>
> diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
> index fab361939c..edf3e1c0d5 100644
> --- a/hw/arm/raspi.c
> +++ b/hw/arm/raspi.c
> @@ -33,10 +33,28 @@
>
> #define MACH_TYPE_BCM2708   3138 /* Linux board IDs */
>
> -typedef struct RasPiState {
> +typedef struct RaspiMachineState {
> +    /*< private >*/
> +    MachineState parent_obj;
> +    /*< public >*/
>     BCM283XState soc;
>     MemoryRegion ram;
> -} RasPiState;
> +} RaspiMachineState;
> +
> +typedef struct RaspiMachineClass {
> +    /*< private >*/
> +    MachineClass parent_obj;
> +    /*< public >*/
> +} RaspiMachineClass;
> +
> +#define TYPE_RASPI_MACHINE       MACHINE_TYPE_NAME("raspi-common")
> +#define RASPI_MACHINE(obj) \
> +    OBJECT_CHECK(RaspiMachineState, (obj), TYPE_RASPI_MACHINE)
> +
> +#define RASPI_MACHINE_CLASS(klass) \
> +     OBJECT_CLASS_CHECK(RaspiMachineClass, (klass), TYPE_RASPI_MACHINE)
> +#define RASPI_MACHINE_GET_CLASS(obj) \
> +     OBJECT_GET_CLASS(RaspiMachineClass, (obj), TYPE_RASPI_MACHINE)
>
> /*
>  * Board revision codes:
> @@ -210,7 +228,7 @@ static void setup_boot(MachineState *machine, int version, 
> size_t ram_size)
>
> static void raspi_init(MachineState *machine, uint32_t board_rev)
> {
> -    RasPiState *s = g_new0(RasPiState, 1);
> +    RaspiMachineState *s = RASPI_MACHINE(machine);
>     int version = board_version(board_rev);
>     uint64_t ram_size = board_ram_size(board_rev);
>     uint32_t vcram_size;
> @@ -263,8 +281,10 @@ static void raspi2_init(MachineState *machine)
>     raspi_init(machine, 0xa21041);
> }
>
> -static void raspi2_machine_init(MachineClass *mc)
> +static void raspi2_machine_class_init(ObjectClass *oc, void *data)
> {
> +    MachineClass *mc = MACHINE_CLASS(oc);
> +
>     mc->desc = "Raspberry Pi 2B";
>     mc->init = raspi2_init;
>     mc->block_default_type = IF_SD;
> @@ -277,7 +297,6 @@ static void raspi2_machine_init(MachineClass *mc)
>     mc->default_ram_size = 1 * GiB;
>     mc->ignore_memory_transaction_failures = true;
> };
> -DEFINE_MACHINE("raspi2", raspi2_machine_init)
>
> #ifdef TARGET_AARCH64
> static void raspi3_init(MachineState *machine)
> @@ -285,8 +304,10 @@ static void raspi3_init(MachineState *machine)
>     raspi_init(machine, 0xa02082);
> }
>
> -static void raspi3_machine_init(MachineClass *mc)
> +static void raspi3_machine_class_init(ObjectClass *oc, void *data)
> {
> +    MachineClass *mc = MACHINE_CLASS(oc);
> +
>     mc->desc = "Raspberry Pi 3B";
>     mc->init = raspi3_init;
>     mc->block_default_type = IF_SD;
> @@ -298,5 +319,26 @@ static void raspi3_machine_init(MachineClass *mc)
>     mc->default_cpus = BCM283X_NCPUS;
>     mc->default_ram_size = 1 * GiB;
> }
> -DEFINE_MACHINE("raspi3", raspi3_machine_init)
> #endif
> +
> +static const TypeInfo raspi_machine_types[] = {
> +    {
> +        .name           = MACHINE_TYPE_NAME("raspi2"),
> +        .parent         = TYPE_RASPI_MACHINE,
> +        .class_init     = raspi2_machine_class_init,
> +#ifdef TARGET_AARCH64
> +    }, {
> +        .name           = MACHINE_TYPE_NAME("raspi3"),
> +        .parent         = TYPE_RASPI_MACHINE,
> +        .class_init     = raspi3_machine_class_init,
> +#endif
> +    }, {
> +        .name           = TYPE_RASPI_MACHINE,
> +        .parent         = TYPE_MACHINE,
> +        .instance_size  = sizeof(RaspiMachineState),
> +        .class_size     = sizeof(RaspiMachineClass),
> +        .abstract       = true,
> +    }
> +};
> +
> +DEFINE_TYPES(raspi_machine_types)