From 5185f0e0a6bb076cd1cd0115ef785298a97a71fe Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Sat, 1 Nov 2014 13:56:10 -0200 Subject: qdev: Move error printing to the end of qdev_device_help() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 982f3f4c09..a9702d89c2 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) -- cgit v1.2.3