From: Marc-André Lureau Date: Thu, 14 Jul 2016 16:03:49 +0000 (+0200) Subject: sd: free timer X-Git-Tag: v2.8.0-rc0~154^2~6 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5ba344013c2def84483f83881a631fb18f14ed42;p=qemu-xen-unstable.git sd: free timer Free the timer allocated in instance_init. Signed-off-by: Marc-André Lureau Reviewed-by: Andrew Baumann --- diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 87c6dc108d..8e88e8311a 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1876,6 +1876,14 @@ static void sd_instance_init(Object *obj) sd->ocr_power_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, sd_ocr_powerup, sd); } +static void sd_instance_finalize(Object *obj) +{ + SDState *sd = SD_CARD(obj); + + timer_del(sd->ocr_power_timer); + timer_free(sd->ocr_power_timer); +} + static void sd_realize(DeviceState *dev, Error **errp) { SDState *sd = SD_CARD(dev); @@ -1927,6 +1935,7 @@ static const TypeInfo sd_info = { .class_size = sizeof(SDCardClass), .class_init = sd_class_init, .instance_init = sd_instance_init, + .instance_finalize = sd_instance_finalize, }; static void sd_register_types(void)