[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/3] qdev: Move error printing to the end of qdev_dev
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 2/3] qdev: Move error printing to the end of qdev_device_help() |
Date: |
Tue, 4 Nov 2014 18:30:08 +0100 |
From: Eduardo Habkost <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
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)
--
1.8.4.5