From patchwork Tue Nov 4 17:30:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 406716 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 97EB1140079 for ; Wed, 5 Nov 2014 04:31:04 +1100 (AEDT) Received: from localhost ([::1]:42050 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xlhwc-0007oy-In for incoming@patchwork.ozlabs.org; Tue, 04 Nov 2014 12:31:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xlhvw-000710-Q2 for qemu-devel@nongnu.org; Tue, 04 Nov 2014 12:30:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xlhvn-0004mD-08 for qemu-devel@nongnu.org; Tue, 04 Nov 2014 12:30:20 -0500 Received: from cantor2.suse.de ([195.135.220.15]:54242 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xlhvm-0004ln-Q7 for qemu-devel@nongnu.org; Tue, 04 Nov 2014 12:30:10 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 29B81AC9F; Tue, 4 Nov 2014 17:30:10 +0000 (UTC) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 4 Nov 2014 18:30:08 +0100 Message-Id: <1415122209-29164-3-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1415122209-29164-1-git-send-email-afaerber@suse.de> References: <1415122209-29164-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 Cc: Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PULL 2/3] qdev: Move error printing to the end of qdev_device_help() 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: Eduardo Habkost Signed-off-by: Eduardo Habkost Signed-off-by: Andreas Färber --- qdev-monitor.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index 982f3f4..a9702d8 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -245,9 +245,7 @@ int qdev_device_help(QemuOpts *opts) prop_list = qmp_device_list_properties(driver, &local_err); if (local_err) { - error_printf("%s\n", error_get_pretty(local_err)); - error_free(local_err); - return 1; + goto error; } for (prop = prop_list; prop; prop = prop->next) { @@ -263,6 +261,11 @@ int qdev_device_help(QemuOpts *opts) qapi_free_DevicePropertyInfoList(prop_list); return 1; + +error: + error_printf("%s\n", error_get_pretty(local_err)); + error_free(local_err); + return 1; } static Object *qdev_get_peripheral(void)