Commit dfe22799 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'kraxel/chardev.8' into staging 



# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/chardev.8:
  chardev: handle qmp_chardev_add(KIND_MUX) failure

Message-id: 1380708925-6721-1-git-send-email-kraxel@redhat.com
Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
parents ce079abb ee6ee83d

qemu-char.c

+6 −1
Original line number Diff line number Diff line
@@ -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);