[Qemu-devel] [PULL 0/1] chardev: handle qmp_chardev_add(KIND_MUX) failure

[Qemu-devel] [PULL 0/1] chardev: handle qmp_chardev_add(KIND_MUX) failure

[Gerd Hoffmann]

  Hi,

Single chardev fix, $subject says all.

please pull,
  Gerd

The following changes since commit a684f3cf9b9b9c3cb82be87aafc463de8974610c:

  Merge remote-tracking branch 'kraxel/seabios-1.7.3.2' into staging (2013-09-30 17:15:27 -0500)

are available in the git repository at:


  git://git.kraxel.org/qemu chardev.8

for you to fetch changes up to ee6ee83de29923483b4905b35f18abf5333f6ea9:

  chardev: handle qmp_chardev_add(KIND_MUX) failure (2013-10-01 10:16:04 +0200)

----------------------------------------------------------------
Gerd Hoffmann (1):
      chardev: handle qmp_chardev_add(KIND_MUX) failure

 qemu-char.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

[Qemu-devel] [PATCH 1/1] chardev: handle qmp_chardev_add(KIND_MUX) failure

[Gerd Hoffmann]

Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 qemu-char.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/qemu-char.c b/qemu-char.c
index f7f5464..2ca34cd 100644
--- 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);
-- 
1.8.3.1