SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/arm/raspi: Avoid using TypeInfo::class_data pointer

Browse Source 
Using class_data pointer to create a MachineClass is not
the recommended way anymore. The correct way is to open-code
the MachineClass::fields in the class_init() method.

We can not use TYPE_RASPI_MACHINE::class_base_init() because
it is called *before* each machine class_init(), therefore the
board_rev field is not populated. We have to manually call
raspi_machine_class_common_init() for each machine.

This partly reverts commit a03bde3674e.

Suggested-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20200924111808.77168-5-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-09-24 13:18:04 +02:00 committed by Peter Maydell
parent 0f15c6e338
commit f0eeb4b615
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hw/arm/raspi.c
View File

@ -306,13 +306,9 @@ static void raspi_machine_init(MachineState *machine)
setup_boot(machine, version, machine->ram_size - vcram_size); setup_boot(machine, version, machine->ram_size - vcram_size);
} }
static void raspi_machine_class_init(ObjectClass *oc, void *data) static void raspi_machine_class_common_init(MachineClass *mc,
uint32_t board_rev)
{ {
MachineClass *mc = MACHINE_CLASS(oc);
RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
uint32_t board_rev = (uint32_t)(uintptr_t)data;
rmc->board_rev = board_rev;
mc->desc = g_strdup_printf("Raspberry Pi %s (revision 1.%u)", mc->desc = g_strdup_printf("Raspberry Pi %s (revision 1.%u)",
board_type(board_rev), board_type(board_rev),
FIELD_EX32(board_rev, REV_CODE, REVISION)); FIELD_EX32(board_rev, REV_CODE, REVISION));
@ -326,18 +322,36 @@ static void raspi_machine_class_init(ObjectClass *oc, void *data)
mc->default_ram_id = "ram"; mc->default_ram_id = "ram";
}; };
static void raspi2b_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
rmc->board_rev = 0xa21041;
raspi_machine_class_common_init(mc, rmc->board_rev);
};
#ifdef TARGET_AARCH64
static void raspi3b_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
rmc->board_rev = 0xa02082;
raspi_machine_class_common_init(mc, rmc->board_rev);
};
#endif /* TARGET_AARCH64 */
static const TypeInfo raspi_machine_types[] = { static const TypeInfo raspi_machine_types[] = {
{ {
.name = MACHINE_TYPE_NAME("raspi2"), .name = MACHINE_TYPE_NAME("raspi2"),
.parent = TYPE_RASPI_MACHINE, .parent = TYPE_RASPI_MACHINE,
.class_init = raspi_machine_class_init, .class_init = raspi2b_machine_class_init,
.class_data = (void *)0xa21041,
#ifdef TARGET_AARCH64 #ifdef TARGET_AARCH64
}, { }, {
.name = MACHINE_TYPE_NAME("raspi3"), .name = MACHINE_TYPE_NAME("raspi3"),
.parent = TYPE_RASPI_MACHINE, .parent = TYPE_RASPI_MACHINE,
.class_init = raspi_machine_class_init, .class_init = raspi3b_machine_class_init,
.class_data = (void *)0xa02082,
#endif #endif
}, { }, {
.name = TYPE_RASPI_MACHINE, .name = TYPE_RASPI_MACHINE,