On 30/3/22 14:56, Damien Hedde wrote:
qom-path of cpus are changed:
+ "apu-cluster/apu-cpu[n]" to "apu/cpu[n]"
+ "rpu-cluster/rpu-cpu[n]" to "rpu/cpu[n]"
Signed-off-by: Damien Hedde <damien.he...@greensocs.com>
---
include/hw/arm/xlnx-zynqmp.h | 8 +--
hw/arm/xlnx-zynqmp.c | 121 +++++++++++++----------------------
2 files changed, 48 insertions(+), 81 deletions(-)
static void xlnx_zynqmp_create_bbram(XlnxZynqMPState *s, qemu_irq *gic)
@@ -296,7 +282,8 @@ static void xlnx_zynqmp_create_apu_ctrl(XlnxZynqMPState *s,
qemu_irq *gic)
g_autofree gchar *name = g_strdup_printf("cpu%d", i);
object_property_set_link(OBJECT(&s->apu_ctrl), name,
- OBJECT(&s->apu_cpu[i]), &error_abort);
+ OBJECT(arm_cpus_get_cpu(&s->apu, i)),
+ &error_abort);
}
Possible further improvement, XlnxZynqMPAPUCtrl can now take a link to
one ArmCpusGroup, instead of array of ARMCPU.
