mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/fsl-imx25: Fix introspection problem with the "fsl, imx25" device

Browse Source 
Running QEMU with valgrind indicates a problem here:

echo "{'execute':'qmp_capabilities'} {'execute':'device-list-properties'," \
 "'arguments':{'typename':'fsl,imx25'}}" \
 "{'execute': 'human-monitor-command', " \
 "'arguments': {'command-line': 'info qtree'}}" | \
 valgrind -q aarch64-softmmu/qemu-system-aarch64 -M none,accel=qtest -qmp stdio
[...]
==26724== Invalid read of size 8
==26724==    at 0x6190DA: qdev_print (qdev-monitor.c:686)
==26724==    by 0x6190DA: qbus_print (qdev-monitor.c:719)
[...]

Use the new sysbus_init_child_obj() to make sure that the objects are
cleaned up correctly when the parent gets destroyed.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-id: 1531745974-17187-11-git-send-email-thuth@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Thomas Huth 2018-07-16 14:59:27 +02:00 committed by Peter Maydell
parent f8bf4b6d38
commit 51dd12ac0e
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/arm/fsl-imx25.c
View File

@ -39,38 +39,36 @@ static void fsl_imx25_init(Object *obj)
object_initialize(&s->cpu, sizeof(s->cpu), "arm926-" TYPE_ARM_CPU); object_initialize(&s->cpu, sizeof(s->cpu), "arm926-" TYPE_ARM_CPU);
object_initialize(&s->avic, sizeof(s->avic), TYPE_IMX_AVIC); sysbus_init_child_obj(obj, "avic", &s->avic, sizeof(s->avic),
qdev_set_parent_bus(DEVICE(&s->avic), sysbus_get_default()); TYPE_IMX_AVIC);
object_initialize(&s->ccm, sizeof(s->ccm), TYPE_IMX25_CCM); sysbus_init_child_obj(obj, "ccm", &s->ccm, sizeof(s->ccm), TYPE_IMX25_CCM);
qdev_set_parent_bus(DEVICE(&s->ccm), sysbus_get_default());
for (i = 0; i < FSL_IMX25_NUM_UARTS; i++) { for (i = 0; i < FSL_IMX25_NUM_UARTS; i++) {
object_initialize(&s->uart[i], sizeof(s->uart[i]), TYPE_IMX_SERIAL); sysbus_init_child_obj(obj, "uart[*]", &s->uart[i], sizeof(s->uart[i]),
qdev_set_parent_bus(DEVICE(&s->uart[i]), sysbus_get_default()); TYPE_IMX_SERIAL);
} }
for (i = 0; i < FSL_IMX25_NUM_GPTS; i++) { for (i = 0; i < FSL_IMX25_NUM_GPTS; i++) {
object_initialize(&s->gpt[i], sizeof(s->gpt[i]), TYPE_IMX25_GPT); sysbus_init_child_obj(obj, "gpt[*]", &s->gpt[i], sizeof(s->gpt[i]),
qdev_set_parent_bus(DEVICE(&s->gpt[i]), sysbus_get_default()); TYPE_IMX25_GPT);
} }
for (i = 0; i < FSL_IMX25_NUM_EPITS; i++) { for (i = 0; i < FSL_IMX25_NUM_EPITS; i++) {
object_initialize(&s->epit[i], sizeof(s->epit[i]), TYPE_IMX_EPIT); sysbus_init_child_obj(obj, "epit[*]", &s->epit[i], sizeof(s->epit[i]),
qdev_set_parent_bus(DEVICE(&s->epit[i]), sysbus_get_default()); TYPE_IMX_EPIT);
} }
object_initialize(&s->fec, sizeof(s->fec), TYPE_IMX_FEC); sysbus_init_child_obj(obj, "fec", &s->fec, sizeof(s->fec), TYPE_IMX_FEC);
qdev_set_parent_bus(DEVICE(&s->fec), sysbus_get_default());
for (i = 0; i < FSL_IMX25_NUM_I2CS; i++) { for (i = 0; i < FSL_IMX25_NUM_I2CS; i++) {
object_initialize(&s->i2c[i], sizeof(s->i2c[i]), TYPE_IMX_I2C); sysbus_init_child_obj(obj, "i2c[*]", &s->i2c[i], sizeof(s->i2c[i]),
qdev_set_parent_bus(DEVICE(&s->i2c[i]), sysbus_get_default()); TYPE_IMX_I2C);
} }
for (i = 0; i < FSL_IMX25_NUM_GPIOS; i++) { for (i = 0; i < FSL_IMX25_NUM_GPIOS; i++) {
object_initialize(&s->gpio[i], sizeof(s->gpio[i]), TYPE_IMX_GPIO); sysbus_init_child_obj(obj, "gpio[*]", &s->gpio[i], sizeof(s->gpio[i]),
qdev_set_parent_bus(DEVICE(&s->gpio[i]), sysbus_get_default()); TYPE_IMX_GPIO);
} }
} }