From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 4 Nov 2014 18:30:08 +0100 Message-Id: <1415122209-29164-3-git-send-email-afaerber@suse.de> 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 2/3] qdev: Move error printing to the end of qdev_device_help() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Eduardo Habkost Signed-off-by: Eduardo Habkost Signed-off-by: Andreas F=C3=A4rber --- 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) =20 prop_list =3D 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; } =20 for (prop =3D prop_list; prop; prop =3D prop->next) { @@ -263,6 +261,11 @@ int qdev_device_help(QemuOpts *opts) =20 qapi_free_DevicePropertyInfoList(prop_list); return 1; + +error: + error_printf("%s\n", error_get_pretty(local_err)); + error_free(local_err); + return 1; } =20 static Object *qdev_get_peripheral(void) --=20 1.8.4.5