From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e05KJ-0007hM-G3 for qemu-devel@nongnu.org; Thu, 05 Oct 2017 08:32:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e05KD-0006ZF-VX for qemu-devel@nongnu.org; Thu, 05 Oct 2017 08:32:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42100) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e05KD-0006YP-PK for qemu-devel@nongnu.org; Thu, 05 Oct 2017 08:32:25 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CB0973B75E for ; Thu, 5 Oct 2017 12:32:24 +0000 (UTC) From: Thomas Huth Date: Thu, 5 Oct 2017 14:32:17 +0200 Message-Id: <1507206738-816-2-git-send-email-thuth@redhat.com> In-Reply-To: <1507206738-816-1-git-send-email-thuth@redhat.com> References: <1507206738-816-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] qdev_monitor: Simplify error handling in qdev_device_add() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Eduardo Habkost Cc: Markus Armbruster , "Dr. David Alan Gilbert" , Igor Mammedov , Paolo Bonzini Instead of doing the clean-ups on errors multiple times, introduce a jump label at the end of the function that can be used by all error paths that need this cleanup. Suggested-by: Igor Mammedov Signed-off-by: Thomas Huth --- qdev-monitor.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index 8fd6df9..cb2b109 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -620,22 +620,21 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp) /* set properties */ if (qemu_opt_foreach(opts, set_property, dev, &err)) { - error_propagate(errp, err); - object_unparent(OBJECT(dev)); - object_unref(OBJECT(dev)); - return NULL; + goto err_del_dev; } dev->opts = opts; object_property_set_bool(OBJECT(dev), true, "realized", &err); - if (err != NULL) { - error_propagate(errp, err); - dev->opts = NULL; - object_unparent(OBJECT(dev)); - object_unref(OBJECT(dev)); - return NULL; + if (!err) { + return dev; } - return dev; + dev->opts = NULL; + +err_del_dev: + error_propagate(errp, err); + object_unparent(OBJECT(dev)); + object_unref(OBJECT(dev)); + return NULL; } -- 1.8.3.1