diff options
| author | Alistair Francis <alistair.francis@wdc.com> | 2018-07-17 11:03:05 -0700 |
|---|---|---|
| committer | Alistair Francis <alistair.francis@wdc.com> | 2018-07-19 09:05:48 -0700 |
| commit | 5657c3f53ca408a0b8150ecbe70d0cdb3a264d9c (patch) | |
| tree | 48c5a45e6e12055e9e5d71a54a82aa6b8ff58cb6 /hw | |
| parent | a993cb150f228fc5cfee128c44ffb06bf285e7ea (diff) | |
| download | qemu-5657c3f53ca408a0b8150ecbe70d0cdb3a264d9c.zip qemu-5657c3f53ca408a0b8150ecbe70d0cdb3a264d9c.tar.gz qemu-5657c3f53ca408a0b8150ecbe70d0cdb3a264d9c.tar.bz2 | |
riscv_hart: 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 <alistair.francis@wdc.com>
Suggested-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Michael Clark <mjc@sifive.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/riscv/riscv_hart.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c index 75ba7ed..e34a26a 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); |