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 <[email protected]>
Acked-by: Paolo Bonzini <[email protected]>
Reviewed-by: Claudio Fontana <[email protected]>

diff --git a/include/sysemu/char.h b/include/sysemu/char.h
index edf76693d9ee00b8fca4549bcb11bbda4679c9dd..aff193f08033743b9e89f1d71f524e9340b7b433 100644 (file)
--- a/include/sysemu/char.h
+++ b/include/sysemu/char.h
@@ -128,10 +128,18 @@ CharDriverState *qemu_chr_new(const char *label, const char *filename,
 /**
  * @qemu_chr_delete:
  *
- * Destroy a character backend.
+ * Destroy a character backend and remove it from the list of
+ * identified character backends.
  */
 void qemu_chr_delete(CharDriverState *chr);
 
+/**
+ * @qemu_chr_free:
+ *
+ * Destroy a character backend.
+ */
+void qemu_chr_free(CharDriverState *chr);
+
 /**
  * @qemu_chr_fe_set_echo:
  *

diff --git a/qemu-char.c b/qemu-char.c
index 908e7124eb3278a079fc1c2d7b164e44182e3fc0..c4eb4eea310ccef495daa73d791b35a80b74516b 100644 (file)
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3876,9 +3876,8 @@ void qemu_chr_fe_release(CharDriverState *s)
     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 @@ void qemu_chr_delete(CharDriverState *chr)
     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;