From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3pyW-00042t-A1 for qemu-devel@nongnu.org; Thu, 16 Jan 2014 11:39:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W3pyQ-0004EM-Ap for qemu-devel@nongnu.org; Thu, 16 Jan 2014 11:39:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43029) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3pyQ-0004ED-37 for qemu-devel@nongnu.org; Thu, 16 Jan 2014 11:39:18 -0500 From: Igor Mammedov Date: Thu, 16 Jan 2014 17:34:36 +0100 Message-Id: <1389890079-21853-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1389890079-21853-1-git-send-email-imammedo@redhat.com> References: <1389890079-21853-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v1 1/4] object_add: consolidate error handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: sw@weilnetz.de, mjt@tls.msk.ru, lcapitulino@redhat.com, blauwirbel@gmail.com, aliguori@amazon.com, stefanha@gmail.com, pbonzini@redhat.com, rth@twiddle.net Signed-off-by: Igor Mammedov --- qmp.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/qmp.c b/qmp.c index 0f46171..a67e0c4 100644 --- a/qmp.c +++ b/qmp.c @@ -549,15 +549,17 @@ void object_add(const char *type, const char *id, const QDict *qdict, for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) { object_property_set(obj, v, e->key, &local_err); if (local_err) { - error_propagate(errp, local_err); - object_unref(obj); - return; + goto out; } } } object_property_add_child(container_get(object_get_root(), "/objects"), - id, obj, errp); + id, obj, &local_err); +out: + if (local_err) { + error_propagate(errp, local_err); + } object_unref(obj); } -- 1.7.1