Commit af6c91b4 authored by panny060's avatar panny060 Committed by Peter Maydell
Browse files

stellaris: delay timer_new to avoid memleaks 



There is a memory leak when we call 'device_list_properties' with typename = stellaris-gptm. It's easy to reproduce as follow:

  virsh qemu-monitor-command vm1 --pretty '{"execute": "device-list-properties", "arguments": {"typename": "stellaris-gptm"}}'

This patch delay timer_new in realize to fix it.

Reported-by: default avatarEuler Robot <euler.robot@huawei.com>
Signed-off-by: default avatarPan Nengyuan <pannengyuan@huawei.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20200205070659.22488-4-pannengyuan@huawei.com
Cc: qemu-arm@nongnu.org
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 53b95da1

hw/arm/stellaris.c

+6 −1
Original line number Diff line number Diff line
@@ -347,11 +347,15 @@ static void stellaris_gptm_init(Object *obj) 
    sysbus_init_mmio(sbd, &s->iomem);



    s->opaque[0] = s->opaque[1] = s;

}



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

{

    gptm_state *s = STELLARIS_GPTM(dev);

    s->timer[0] = timer_new_ns(QEMU_CLOCK_VIRTUAL, gptm_tick, &s->opaque[0]);

    s->timer[1] = timer_new_ns(QEMU_CLOCK_VIRTUAL, gptm_tick, &s->opaque[1]);

}





/* System controller.  */



typedef struct {
@@ -1536,6 +1540,7 @@ static void stellaris_gptm_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);



    dc->vmsd = &vmstate_stellaris_gptm;

    dc->realize = stellaris_gptm_realize;

}



static const TypeInfo stellaris_gptm_info = {