[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v5 4/4] hw/misc/mos6522: move timer_new from init() into realize(

From: Pan Nengyuan
Subject: [PATCH v5 4/4] hw/misc/mos6522: move timer_new from init() into realize() to avoid memleaks
Date: Sat, 14 Mar 2020 16:47:30 +0800

There are some memleaks when we call 'device_list_properties'.
This patch move timer_new from init into realize to fix it.

Reported-by: Euler Robot <address@hidden>
Signed-off-by: Pan Nengyuan <address@hidden>
Cc: Laurent Vivier <address@hidden>
Cc: Mark Cave-Ayland <address@hidden>
Cc: David Gibson <address@hidden>
Cc: address@hidden
- no changes in this patch.
- remove null check in reset, and add calls to mos6522_realize() in 
mac_via_realize to make this move to be valid.
- split patch into two, this patch fix the memleaks.
- No change in this patch. But add [patch 3/4] to fix SEGVs during make 
check-qtest-ppc64 if apply this patch.
  This patch also depend to another fix [patch 2/4].
 hw/misc/mos6522.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c
index 19e154b870..c1cd154a84 100644
--- a/hw/misc/mos6522.c
+++ b/hw/misc/mos6522.c
@@ -485,6 +485,11 @@ static void mos6522_init(Object *obj)
     for (i = 0; i < ARRAY_SIZE(s->timers); i++) {
         s->timers[i].index = i;
+static void mos6522_realize(DeviceState *dev, Error **errp)
+    MOS6522State *s = MOS6522(dev);
     s->timers[0].timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, mos6522_timer1, s);
     s->timers[1].timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, mos6522_timer2, s);
@@ -502,6 +507,7 @@ static void mos6522_class_init(ObjectClass *oc, void *data)
     dc->reset = mos6522_reset;
     dc->vmsd = &vmstate_mos6522;
+    dc->realize = mos6522_realize;
     device_class_set_props(dc, mos6522_properties);
     mdc->parent_reset = dc->reset;
     mdc->set_sr_int = mos6522_set_sr_int;

reply via email to

[Prev in Thread] Current Thread [Next in Thread]