On Wed, Jul 18, 2018 at 8:28 AM, Alistair Francis <alistair.fran...@wdc.com> wrote:
> Use the new object_initialize_child() and sysbus_init_child_obj() to > fix the issue. > > Signed-off-by: Alistair Francis <alistair.fran...@wdc.com> > Reviewed-by: Michael Clark <m...@sifive.com> > --- > hw/riscv/spike.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c > index f94e2b6707..c8c056c50b 100644 > --- a/hw/riscv/spike.c > +++ b/hw/riscv/spike.c > @@ -171,9 +171,8 @@ static void spike_v1_10_0_board_init(MachineState > *machine) > int i; > > /* Initialize SOC */ > - object_initialize(&s->soc, sizeof(s->soc), TYPE_RISCV_HART_ARRAY); > - object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc), > - &error_abort); > + object_initialize_child(OBJECT(machine), "soc", &s->soc, > sizeof(s->soc), > + TYPE_RISCV_HART_ARRAY, &error_abort, NULL); > object_property_set_str(OBJECT(&s->soc), SPIKE_V1_10_0_CPU, > "cpu-type", > &error_abort); > object_property_set_int(OBJECT(&s->soc), smp_cpus, "num-harts", > @@ -254,9 +253,8 @@ static void spike_v1_09_1_board_init(MachineState > *machine) > int i; > > /* Initialize SOC */ > - object_initialize(&s->soc, sizeof(s->soc), TYPE_RISCV_HART_ARRAY); > - object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc), > - &error_abort); > + object_initialize_child(OBJECT(machine), "soc", &s->soc, > sizeof(s->soc), > + TYPE_RISCV_HART_ARRAY, &error_abort, NULL); > object_property_set_str(OBJECT(&s->soc), SPIKE_V1_09_1_CPU, > "cpu-type", > &error_abort); > object_property_set_int(OBJECT(&s->soc), smp_cpus, "num-harts", > -- > 2.17.1 > >
