Re: [Qemu-devel] [PATCH v1 3/5] virt: Fix crash when introspecting the device
On Wed, Jul 18, 2018 at 8:28 AM, Alistair Francis wrote: > Use the new object_initialize_child() and sysbus_init_child_obj() to > fix the issue. > > Signed-off-by: Alistair Francis > Reviewed-by: Michael Clark > --- > hw/riscv/virt.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index aeada2498d..248bbdffd3 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -274,9 +274,8 @@ static void riscv_virt_board_init(MachineState > *machine) > void *fdt; > > /* Initialize SOC */ > -object_initialize(>soc, sizeof(s->soc), TYPE_RISCV_HART_ARRAY); > -object_property_add_child(OBJECT(machine), "soc", OBJECT(>soc), > - _abort); > +object_initialize_child(OBJECT(machine), "soc", >soc, > sizeof(s->soc), > +TYPE_RISCV_HART_ARRAY, _abort, NULL); > object_property_set_str(OBJECT(>soc), VIRT_CPU, "cpu-type", > _abort); > object_property_set_int(OBJECT(>soc), smp_cpus, "num-harts", > -- > 2.17.1 > >
[Qemu-devel] [PATCH v1 3/5] virt: Fix crash when introspecting the device
Use the new object_initialize_child() and sysbus_init_child_obj() to fix the issue. Signed-off-by: Alistair Francis --- hw/riscv/virt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index aeada2498d..248bbdffd3 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -274,9 +274,8 @@ static void riscv_virt_board_init(MachineState *machine) void *fdt; /* Initialize SOC */ -object_initialize(>soc, sizeof(s->soc), TYPE_RISCV_HART_ARRAY); -object_property_add_child(OBJECT(machine), "soc", OBJECT(>soc), - _abort); +object_initialize_child(OBJECT(machine), "soc", >soc, sizeof(s->soc), +TYPE_RISCV_HART_ARRAY, _abort, NULL); object_property_set_str(OBJECT(>soc), VIRT_CPU, "cpu-type", _abort); object_property_set_int(OBJECT(>soc), smp_cpus, "num-harts", -- 2.17.1