diff options
| author | Markus Armbruster <armbru@redhat.com> | 2020-07-07 18:06:13 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2020-07-10 15:18:09 +0200 |
| commit | a43770df5dbbe90bbe8ccb25e7c570169d10710b (patch) | |
| tree | 71dc85a28d3bc760dfc39e5e09a2b37691958ba3 /qdev-monitor.c | |
| parent | 2d226cf6d18c853a3dca3fae1442be399caa2e6f (diff) | |
hmp: Ignore Error objects where the return value suffices
qdev_print_props() receives and throws away Error objects just to
check for object_property_get_str() and object_property_print()
failure. Unnecessary, both return suitable values, so use those
instead.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-46-armbru@redhat.com>
Diffstat (limited to 'qdev-monitor.c')
| -rw-r--r-- | qdev-monitor.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/qdev-monitor.c b/qdev-monitor.c index 9665a5398c..71ebce19df 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -697,22 +697,22 @@ static void qdev_print_props(Monitor *mon, DeviceState *dev, Property *props, if (!props) return; for (; props->name; props++) { - Error *err = NULL; char *value; char *legacy_name = g_strdup_printf("legacy-%s", props->name); + if (object_property_get_type(OBJECT(dev), legacy_name, NULL)) { - value = object_property_get_str(OBJECT(dev), legacy_name, &err); + value = object_property_get_str(OBJECT(dev), legacy_name, NULL); } else { - value = object_property_print(OBJECT(dev), props->name, true, &err); + value = object_property_print(OBJECT(dev), props->name, true, + NULL); } g_free(legacy_name); - if (err) { - error_free(err); + if (!value) { continue; } qdev_printf("%s = %s\n", props->name, - value && *value ? value : "<null>"); + *value ? value : "<null>"); g_free(value); } } |