[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULLv2 19/25] sd: free timer
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULLv2 19/25] sd: free timer |
Date: |
Thu, 8 Sep 2016 18:17:14 +0400 |
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.10.0
- [Qemu-devel] [PULLv2 09/25] tests: fix check-qom-proplist leaks, (continued)
- [Qemu-devel] [PULLv2 09/25] tests: fix check-qom-proplist leaks, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 11/25] portio: keep references on portio, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 12/25] pc: simplify passing qemu_irq, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 13/25] pc: don't leak a20_line, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 14/25] machine: use class base init generated name, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 16/25] tests: fix qom-test leaks, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 15/25] acpi-build: fix array leak, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 17/25] pc: free i8259, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 18/25] pc: keep gsi reference, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 20/25] ipmi: free extern timer, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 19/25] sd: free timer,
Marc-André Lureau <=
- [Qemu-devel] [PULLv2 22/25] tests: add qtest_add_data_func_full, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 23/25] tests: pc-cpu-test leaks fixes, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 21/25] bus: simplify name handling, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 24/25] tests: fix rsp leak in postcopy-test, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 25/25] tests: fix postcopy-test leaks, Marc-André Lureau, 2016/09/08
- Re: [Qemu-devel] [PULLv2 00/25] Leak patches, Peter Maydell, 2016/09/09