From patchwork Wed Jan 8 16:09:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 308367 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9B7FA2C00A9 for ; Thu, 9 Jan 2014 03:14:38 +1100 (EST) Received: from localhost ([::1]:47606 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0vm8-0000do-Di for incoming@patchwork.ozlabs.org; Wed, 08 Jan 2014 11:14:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0vlW-0000UQ-55 for qemu-devel@nongnu.org; Wed, 08 Jan 2014 11:14:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0vlQ-0003WC-1h for qemu-devel@nongnu.org; Wed, 08 Jan 2014 11:13:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5872) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0vlP-0003Vy-QF for qemu-devel@nongnu.org; Wed, 08 Jan 2014 11:13:51 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s08GDkVG032538 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 8 Jan 2014 11:13:46 -0500 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s08GDbDY006503; Wed, 8 Jan 2014 11:13:44 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 8 Jan 2014 17:09:38 +0100 Message-Id: <1389197382-25085-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1389197382-25085-1-git-send-email-imammedo@redhat.com> References: <1389197382-25085-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: stefanha@redhat.com, sw@weilnetz.de, mjt@tls.msk.ru, lcapitulino@redhat.com, blauwirbel@gmail.com, aliguori@amazon.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net Subject: [Qemu-devel] [PATCH 1/5] object_add: consolidate error handling 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 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); }