From patchwork Tue Jan 28 17:27:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 314791 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 EF4F62C009C for ; Wed, 29 Jan 2014 04:28:02 +1100 (EST) Received: from localhost ([::1]:38632 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8CS8-0006kU-P5 for incoming@patchwork.ozlabs.org; Tue, 28 Jan 2014 12:28:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8CRa-0005i6-1S for qemu-devel@nongnu.org; Tue, 28 Jan 2014 12:27:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W8CRT-0004d2-Gn for qemu-devel@nongnu.org; Tue, 28 Jan 2014 12:27:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43393) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8CRT-0004ca-9Q for qemu-devel@nongnu.org; Tue, 28 Jan 2014 12:27:19 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0SHRD5Z015146 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 28 Jan 2014 12:27:14 -0500 Received: from localhost (ovpn-113-101.phx2.redhat.com [10.3.113.101]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s0SHRDTT012376; Tue, 28 Jan 2014 12:27:13 -0500 From: Luiz Capitulino To: anthony@codemonkey.ws Date: Tue, 28 Jan 2014 12:27:05 -0500 Message-Id: <1390930029-14697-2-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1390930029-14697-1-git-send-email-lcapitulino@redhat.com> References: <1390930029-14697-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 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 From: Igor Mammedov Signed-off-by: Igor Mammedov Reviewed-by: Stefan Hajnoczi Signed-off-by: Luiz Capitulino --- qmp.c | 10 ++++++---- 1 file 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); }