[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 5/5] spike: Fix crash when introspecting the devi
From: |
Alistair Francis |
Subject: |
[Qemu-devel] [PATCH v1 5/5] spike: Fix crash when introspecting the device |
Date: |
Tue, 17 Jul 2018 13:28:39 -0700 |
Use the new object_initialize_child() and sysbus_init_child_obj() to
fix the issue.
Signed-off-by: Alistair Francis <address@hidden>
---
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
- [Qemu-devel] [PATCH v1 0/5] riscv: Fix introspection problems, Alistair Francis, 2018/07/17
- [Qemu-devel] [PATCH v1 1/5] sifive_e: Fix crash when introspecting the device, Alistair Francis, 2018/07/17
- [Qemu-devel] [PATCH v1 2/5] sifive_u: Fix crash when introspecting the device, Alistair Francis, 2018/07/17
- [Qemu-devel] [PATCH v1 3/5] virt: Fix crash when introspecting the device, Alistair Francis, 2018/07/17
- [Qemu-devel] [PATCH v1 4/5] riscv_hart: Fix crash when introspecting the device, Alistair Francis, 2018/07/17
- [Qemu-devel] [PATCH v1 5/5] spike: Fix crash when introspecting the device,
Alistair Francis <=
- Re: [Qemu-devel] [PATCH v1 0/5] riscv: Fix introspection problems, Thomas Huth, 2018/07/18
- Re: [Qemu-devel] [PATCH v1 0/5] riscv: Fix introspection problems, Thomas Huth, 2018/07/18