From patchwork Wed Dec 19 15:59:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 207437 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D0F0B2C0093 for ; Thu, 20 Dec 2012 03:02:31 +1100 (EST) Received: from localhost ([::1]:42699 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlM3d-0000JQ-U3 for incoming@patchwork.ozlabs.org; Wed, 19 Dec 2012 10:59:45 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlM39-0000Ea-B1 for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:59:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlM35-0007zJ-BB for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:59:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:63065) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlM35-0007yy-2P for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:59:11 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBJFxAch016237 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 Dec 2012 10:59:10 -0500 Received: from rincewind.home.kraxel.org (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qBJFx8JV006386; Wed, 19 Dec 2012 10:59:09 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 5E82140B51; Wed, 19 Dec 2012 16:59:07 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 19 Dec 2012 16:59:00 +0100 Message-Id: <1355932747-1755-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1355932747-1755-1-git-send-email-kraxel@redhat.com> References: <1355932747-1755-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, Gerd Hoffmann , mprivozn@redhat.com Subject: [Qemu-devel] [PATCH 2/9] chardev: fix QemuOpts lifecycle X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qemu_chr_new_from_opts handles QemuOpts release now, so callers don't have to worry. It will either be saved in CharDriverState, then released in qemu_chr_delete, or in the error case released instantly. Signed-off-by: Gerd Hoffmann --- qemu-char.c | 15 ++++++++++----- qemu-char.h | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 713eae9..9bb3a6b 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2777,13 +2777,13 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, if (qemu_opts_id(opts) == NULL) { error_setg(errp, "chardev: no id specified\n"); - return NULL; + goto err; } if (qemu_opt_get(opts, "backend") == NULL) { error_setg(errp, "chardev: \"%s\" missing backend\n", qemu_opts_id(opts)); - return NULL; + goto err; } for (i = 0; i < ARRAY_SIZE(backend_table); i++) { if (strcmp(backend_table[i].name, qemu_opt_get(opts, "backend")) == 0) @@ -2792,14 +2792,14 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, if (i == ARRAY_SIZE(backend_table)) { error_setg(errp, "chardev: backend \"%s\" not found\n", qemu_opt_get(opts, "backend")); - return NULL; + goto err; } chr = backend_table[i].open(opts); if (!chr) { error_setg(errp, "chardev: opening backend \"%s\" failed\n", qemu_opt_get(opts, "backend")); - return NULL; + goto err; } if (!chr->filename) @@ -2820,7 +2820,12 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, chr->avail_connections = 1; } chr->label = g_strdup(qemu_opts_id(opts)); + chr->opts = opts; return chr; + +err: + qemu_opts_del(opts); + return NULL; } CharDriverState *qemu_chr_new(const char *label, const char *filename, void (*init)(struct CharDriverState *s)) @@ -2846,7 +2851,6 @@ CharDriverState *qemu_chr_new(const char *label, const char *filename, void (*in if (chr && qemu_opt_get_bool(opts, "mux", 0)) { monitor_init(chr, MONITOR_USE_READLINE); } - qemu_opts_del(opts); return chr; } @@ -2878,6 +2882,7 @@ void qemu_chr_delete(CharDriverState *chr) chr->chr_close(chr); g_free(chr->filename); g_free(chr->label); + qemu_opts_del(chr->opts); g_free(chr); } diff --git a/qemu-char.h b/qemu-char.h index d7eed34..f984071 100644 --- a/qemu-char.h +++ b/qemu-char.h @@ -75,6 +75,7 @@ struct CharDriverState { char *filename; int opened; int avail_connections; + QemuOpts *opts; QTAILQ_ENTRY(CharDriverState) next; };