On Sat, 8 Feb 2020 17:56:38 +0100 Philippe Mathieu-Daudé <f4...@amsat.org> wrote:
> There is no point in creating the SoC object before allocating the RAM. > Move the call to keep all the SoC-related calls together. > > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> Acked-by: Igor Mammedov <imamm...@redhat.com> > --- > hw/arm/raspi.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c > index 7a2ca97347..b3e6f72b55 100644 > --- a/hw/arm/raspi.c > +++ b/hw/arm/raspi.c > @@ -227,9 +227,6 @@ static void raspi_init(MachineState *machine, uint32_t > board_rev) > exit(1); > } > > - object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc), > - board_soc_type(board_rev), &error_abort, NULL); > - > /* Allocate and map RAM */ > memory_region_allocate_system_memory(&s->ram, OBJECT(machine), "ram", > machine->ram_size); > @@ -237,6 +234,8 @@ static void raspi_init(MachineState *machine, uint32_t > board_rev) > memory_region_add_subregion_overlap(get_system_memory(), 0, &s->ram, 0); > > /* Setup the SOC */ > + object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc), > + board_soc_type(board_rev), &error_abort, NULL); > object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(&s->ram), > &error_abort); > object_property_set_int(OBJECT(&s->soc), board_rev, "board-rev",
