From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRJT8-0006t5-PN for qemu-devel@nongnu.org; Wed, 02 Oct 2013 06:15:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VRJT2-0003AA-Q0 for qemu-devel@nongnu.org; Wed, 02 Oct 2013 06:15:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63890) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRJT2-0003A5-HU for qemu-devel@nongnu.org; Wed, 02 Oct 2013 06:15:40 -0400 From: Gerd Hoffmann Date: Wed, 2 Oct 2013 12:15:25 +0200 Message-Id: <1380708925-6721-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1380708925-6721-1-git-send-email-kraxel@redhat.com> References: <1380708925-6721-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1/1] chardev: handle qmp_chardev_add(KIND_MUX) failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori , Markus Armbruster Cc: Markus Armbruster Signed-off-by: Gerd Hoffmann --- 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