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: Anthony Liguori <anthony@codemonkey.ws>
This commit is contained in:
commit
dfe2279975
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue