From: Eduardo Habkost <ehabkost@redhat.com>
Date: Sat, 1 Nov 2014 15:56:10 +0000 (-0200)
Subject: qdev: Move error printing to the end of qdev_device_help()
X-Git-Tag: v2.2.0-rc0~4^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5185f0e0a6bb076cd1cd0115ef785298a97a71fe;p=thirdparty%2Fqemu.git

qdev: Move error printing to the end of qdev_device_help()

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/qdev-monitor.c b/qdev-monitor.c
index 982f3f4c09b..a9702d89c28 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)