[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.7 v3 25/36] sd: free timer
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH for-2.7 v3 25/36] sd: free timer |
Date: |
Wed, 3 Aug 2016 18:55:30 +0400 |
From: Marc-André Lureau <address@hidden>
Free the timer allocated in instance_init.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Andrew Baumann <address@hidden>
---
hw/sd/sd.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 87c6dc1..8e88e83 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)
--
2.9.0
- [Qemu-devel] [PATCH for-2.7 v3 19/36] char: free the tcp connection data when closing, (continued)
- [Qemu-devel] [PATCH for-2.7 v3 23/36] pc: keep gsi reference, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 24/36] ahci: free irqs array, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 25/36] sd: free timer,
marcandre . lureau <=
- [Qemu-devel] [PATCH for-2.7 v3 26/36] qjson: free str, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 27/36] virtio-input: free config list, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 28/36] ipmi: free extern timer, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 29/36] usb: free USBDevice.strings, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 30/36] usb: free leaking path, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 31/36] bus: simplify name handling, marcandre . lureau, 2016/08/03
- [Qemu-devel] [PATCH for-2.7 v3 32/36] tests: add qtest_add_data_func_full, marcandre . lureau, 2016/08/03