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/riscv_hart.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c
> index 75ba7ed579..e34a26a0ef 100644
> --- a/hw/riscv/riscv_hart.c
> +++ b/hw/riscv/riscv_hart.c
> @@ -45,11 +45,10 @@ static void riscv_harts_realize(DeviceState *dev,
> Error **errp)
> s->harts = g_new0(RISCVCPU, s->num_harts);
>
> for (n = 0; n < s->num_harts; n++) {
> -
> - object_initialize(&s->harts[n], sizeof(RISCVCPU), s->cpu_type);
> + object_initialize_child(OBJECT(s), "harts[*]", &s->harts[n],
> + sizeof(RISCVCPU), s->cpu_type,
> + &error_abort, NULL);
> s->harts[n].env.mhartid = n;
> - object_property_add_child(OBJECT(s), "harts[*]",
> OBJECT(&s->harts[n]),
> - &error_abort);
> qemu_register_reset(riscv_harts_cpu_reset, &s->harts[n]);
> object_property_set_bool(OBJECT(&s->harts[n]), true,
> "realized", &err);
> --
> 2.17.1
>
>
