Merge remote-tracking branch 'mjt/trivial-patches' into staging

[qemu.git] / qemu-char.c

diff --git a/qemu-char.c b/qemu-char.c
index 6d393e6a1b329652673de5c8f1a5b694d7291aab..13474def3338d816c33cac68a5f74ba79eef6f77 100644 (file)
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3271,7 +3271,12 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts,
             backend->kind = CHARDEV_BACKEND_KIND_MUX;
             backend->mux->chardev = g_strdup(bid);
             ret = qmp_chardev_add(id, backend, errp);
-            assert(!error_is_set(errp));
+            if (error_is_set(errp)) {
+                chr = qemu_chr_find(bid);
+                qemu_chr_delete(chr);
+                chr = NULL;
+                goto qapi_out;
+            }
         }
 
         chr = qemu_chr_find(id);