[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 07/17] hw/cpu/a9mpcore: Fix introspection pro
From: |
Alistair Francis |
Subject: |
Re: [Qemu-devel] [PATCH v3 07/17] hw/cpu/a9mpcore: Fix introspection problems with the "a9mpcore_priv" device |
Date: |
Mon, 16 Jul 2018 15:03:11 -0700 |
On Mon, Jul 16, 2018 at 5:59 AM, Thomas Huth <address@hidden> wrote:
> Running QEMU with valgrind indicates a problem here:
>
> echo "{'execute':'qmp_capabilities'} {'execute':'device-list-properties'," \
> "'arguments':{'typename':'a9mpcore_priv'}}" \
> "{'execute': 'human-monitor-command', " \
> "'arguments': {'command-line': 'info qtree'}}" | \
> valgrind -q aarch64-softmmu/qemu-system-aarch64 -M none,accel=qtest -qmp
> stdio
> [...]
> ==30996== Invalid read of size 8
> ==30996== at 0x6185DA: qdev_print (qdev-monitor.c:686)
> ==30996== by 0x6185DA: qbus_print (qdev-monitor.c:719)
> ==30996== by 0x452B38: handle_hmp_command (monitor.c:3446)
> [...]
>
> Use the new sysbus_init_child_obj() function to make sure that the objects
> are cleaned up correctly when the parent gets destroyed.
>
> Reviewed-by: Richard Henderson <address@hidden>
> Reviewed-by: Paolo Bonzini <address@hidden>
> Reviewed-by: Eduardo Habkost <address@hidden>
> Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Alistair
> ---
> hw/cpu/a9mpcore.c | 18 ++++++++----------
> 1 file changed, 8 insertions(+), 10 deletions(-)
>
> diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c
> index f17f292..a5b8678 100644
> --- a/hw/cpu/a9mpcore.c
> +++ b/hw/cpu/a9mpcore.c
> @@ -27,20 +27,18 @@ static void a9mp_priv_initfn(Object *obj)
> memory_region_init(&s->container, obj, "a9mp-priv-container", 0x2000);
> sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->container);
>
> - object_initialize(&s->scu, sizeof(s->scu), TYPE_A9_SCU);
> - qdev_set_parent_bus(DEVICE(&s->scu), sysbus_get_default());
> + sysbus_init_child_obj(obj, "scu", &s->scu, sizeof(s->scu), TYPE_A9_SCU);
>
> - object_initialize(&s->gic, sizeof(s->gic), TYPE_ARM_GIC);
> - qdev_set_parent_bus(DEVICE(&s->gic), sysbus_get_default());
> + sysbus_init_child_obj(obj, "gic", &s->gic, sizeof(s->gic), TYPE_ARM_GIC);
>
> - object_initialize(&s->gtimer, sizeof(s->gtimer), TYPE_A9_GTIMER);
> - qdev_set_parent_bus(DEVICE(&s->gtimer), sysbus_get_default());
> + sysbus_init_child_obj(obj, "gtimer", &s->gtimer, sizeof(s->gtimer),
> + TYPE_A9_GTIMER);
>
> - object_initialize(&s->mptimer, sizeof(s->mptimer), TYPE_ARM_MPTIMER);
> - qdev_set_parent_bus(DEVICE(&s->mptimer), sysbus_get_default());
> + sysbus_init_child_obj(obj, "mptimer", &s->mptimer, sizeof(s->mptimer),
> + TYPE_ARM_MPTIMER);
>
> - object_initialize(&s->wdt, sizeof(s->wdt), TYPE_ARM_MPTIMER);
> - qdev_set_parent_bus(DEVICE(&s->wdt), sysbus_get_default());
> + sysbus_init_child_obj(obj, "wdt", &s->wdt, sizeof(s->wdt),
> + TYPE_ARM_MPTIMER);
> }
>
> static void a9mp_priv_realize(DeviceState *dev, Error **errp)
> --
> 1.8.3.1
>
>
- Re: [Qemu-devel] [PATCH v3 02/17] hw/core/sysbus: Add a function for creating and attaching an object, (continued)
- [Qemu-devel] [PATCH v3 03/17] hw/arm/bcm2836: Fix crash with device_add bcm2837 on unsupported machines, Thomas Huth, 2018/07/16
- [Qemu-devel] [PATCH v3 01/17] qom/object: Add a new function object_initialize_child(), Thomas Huth, 2018/07/16
- [Qemu-devel] [PATCH v3 04/17] hw/arm/armv7: Fix crash when introspecting the "iotkit" device, Thomas Huth, 2018/07/16
- [Qemu-devel] [PATCH v3 05/17] hw/cpu/a15mpcore: Fix introspection problem with the a15mpcore_priv device, Thomas Huth, 2018/07/16
- [Qemu-devel] [PATCH v3 06/17] hw/arm/msf2-soc: Fix introspection problem with the "msf2-soc" device, Thomas Huth, 2018/07/16
- [Qemu-devel] [PATCH v3 07/17] hw/cpu/a9mpcore: Fix introspection problems with the "a9mpcore_priv" device, Thomas Huth, 2018/07/16
- Re: [Qemu-devel] [PATCH v3 07/17] hw/cpu/a9mpcore: Fix introspection problems with the "a9mpcore_priv" device,
Alistair Francis <=
- [Qemu-devel] [PATCH v3 08/17] hw/arm/fsl-imx6: Fix introspection problems with the "fsl, imx6" device, Thomas Huth, 2018/07/16
- [Qemu-devel] [PATCH v3 09/17] hw/arm/fsl-imx7: Fix introspection problems with the "fsl, imx7" device, Thomas Huth, 2018/07/16
- [Qemu-devel] [PATCH v3 11/17] hw/arm/fsl-imx31: Fix introspection problem with the "fsl, imx31" device, Thomas Huth, 2018/07/16
- [Qemu-devel] [PATCH v3 10/17] hw/arm/fsl-imx25: Fix introspection problem with the "fsl, imx25" device, Thomas Huth, 2018/07/16
- [Qemu-devel] [PATCH v3 12/17] hw/cpu/arm11mpcore: Fix introspection problem with 'arm11mpcore_priv', Thomas Huth, 2018/07/16
- [Qemu-devel] [PATCH v3 14/17] hw/arm/allwinner-a10: Fix introspection problem with 'allwinner-a10', Thomas Huth, 2018/07/16
- [Qemu-devel] [PATCH v3 13/17] hw/*/realview: Fix introspection problem with 'realview_mpcore' & 'realview_gic', Thomas Huth, 2018/07/16
- [Qemu-devel] [PATCH v3 15/17] hw/arm/stm32f205_soc: Fix introspection problem with 'stm32f205-soc' device, Thomas Huth, 2018/07/16