Commit 7b6d7b84 authored by Thomas Huth's avatar Thomas Huth Committed by Peter Maydell
Browse files

hw/microblaze/xlnx-zynqmp-pmu: Fix introspection problem in 'xlnx, zynqmp-pmu-soc' 



Valgrind complains:

echo "{'execute':'qmp_capabilities'} {'execute':'device-list-properties'," \
 "'arguments':{'typename':'xlnx,zynqmp-pmu-soc'}}" \
 "{'execute': 'human-monitor-command', " \
 "'arguments': {'command-line': 'info qtree'}}" | \
 valgrind -q microblazeel-softmmu/qemu-system-microblazeel -M none,accel=qtest -qmp stdio
[...]
==13605== Invalid read of size 8
==13605==    at 0x2AC69A: qdev_print (qdev-monitor.c:686)
==13605==    by 0x2AC69A: qbus_print (qdev-monitor.c:719)
==13605==    by 0x2591E8: handle_hmp_command (monitor.c:3446)

Use the new object_initialize_child() and sysbus_init_child_obj() to
fix the issue.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 1531839343-13828-1-git-send-email-thuth@redhat.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 55b1f14c

hw/microblaze/xlnx-zynqmp-pmu.c

+4 −6
Original line number Diff line number Diff line
@@ -62,13 +62,11 @@ static void xlnx_zynqmp_pmu_soc_init(Object *obj) 
{

    XlnxZynqMPPMUSoCState *s = XLNX_ZYNQMP_PMU_SOC(obj);



    object_initialize(&s->cpu, sizeof(s->cpu),

                      TYPE_MICROBLAZE_CPU);

    object_property_add_child(obj, "pmu-cpu", OBJECT(&s->cpu),

                              &error_abort);

    object_initialize_child(obj, "pmu-cpu", &s->cpu, sizeof(s->cpu),

                            TYPE_MICROBLAZE_CPU, &error_abort, NULL);



    object_initialize(&s->intc, sizeof(s->intc), TYPE_XLNX_PMU_IO_INTC);

    qdev_set_parent_bus(DEVICE(&s->intc), sysbus_get_default());

    sysbus_init_child_obj(obj, "intc", &s->intc, sizeof(s->intc),

                          TYPE_XLNX_PMU_IO_INTC);

}



static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev, Error **errp)