commit 1ad78ea51aad7978638299a27004049935c2d913
author Marc-André Lureau <marcandre.lureau@redhat.com> Mon Jun 22 18:20:18 2015 +0200
committer Marc-André Lureau <marcandre.lureau@redhat.com> Sat Oct 24 18:02:48 2015 +0200
tree db3a45569be0c91e195a54e89425b61323fb90b9
parent bbfc2efefe9779f85dfe2713aec1568b1ba871ad

char: add qemu_chr_free()

If a chardev is allowed to be created outside of QMP, then it must be
also possible to free it. This is useful for ivshmem that creates
chardev anonymously and must be able to free them.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>

qemu-char.c

diff --git a/qemu-char.c b/qemu-char.c
index 908e712..c4eb4ee 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3876,9 +3876,8 @@
     s->avail_connections++;
 }
 
-void qemu_chr_delete(CharDriverState *chr)
+void qemu_chr_free(CharDriverState *chr)
 {
-    QTAILQ_REMOVE(&chardevs, chr, next);
     if (chr->chr_close) {
         chr->chr_close(chr);
     }
@@ -3888,6 +3887,12 @@
     g_free(chr);
 }
 
+void qemu_chr_delete(CharDriverState *chr)
+{
+    QTAILQ_REMOVE(&chardevs, chr, next);
+    qemu_chr_free(chr);
+}
+
 ChardevInfoList *qmp_query_chardev(Error **errp)
 {
     ChardevInfoList *chr_list = NULL;