38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From: Li Qiang <liqiang6-s@360.cn>
|
|
Date: Wed, 4 Jan 2017 00:43:16 -0800
|
|
Subject: [PATCH] serial: fix memory leak in serial exit
|
|
|
|
The serial_exit_core function doesn't free some resources.
|
|
This can lead memory leak when hotplug and unplug. This
|
|
patch avoid this.
|
|
|
|
Signed-off-by: Li Qiang <liqiang6-s@360.cn>
|
|
Message-Id: <586cb5ab.f31d9d0a.38ac3.acf2@mx.google.com>
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit 8409dc884a201bf74b30a9d232b6bbdd00cb7e2b)
|
|
---
|
|
hw/char/serial.c | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
diff --git a/hw/char/serial.c b/hw/char/serial.c
|
|
index eec72b7b9e..455119f3d7 100644
|
|
--- a/hw/char/serial.c
|
|
+++ b/hw/char/serial.c
|
|
@@ -904,6 +904,16 @@ void serial_realize_core(SerialState *s, Error **errp)
|
|
void serial_exit_core(SerialState *s)
|
|
{
|
|
qemu_chr_add_handlers(s->chr, NULL, NULL, NULL, NULL);
|
|
+
|
|
+ timer_del(s->modem_status_poll);
|
|
+ timer_free(s->modem_status_poll);
|
|
+
|
|
+ timer_del(s->fifo_timeout_timer);
|
|
+ timer_free(s->fifo_timeout_timer);
|
|
+
|
|
+ fifo8_destroy(&s->recv_fifo);
|
|
+ fifo8_destroy(&s->xmit_fifo);
|
|
+
|
|
qemu_unregister_reset(serial_reset, s);
|
|
}
|
|
|