Skip to content

Commit a43770d

Browse files
author
Markus Armbruster
committed
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 <[email protected]> Reviewed-by: Eric Blake <[email protected]> Message-Id: <[email protected]>
1 parent 2d226cf commit a43770d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

qdev-monitor.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -697,22 +697,22 @@ static void qdev_print_props(Monitor *mon, DeviceState *dev, Property *props,
697697
if (!props)
698698
return;
699699
for (; props->name; props++) {
700-
Error *err = NULL;
701700
char *value;
702701
char *legacy_name = g_strdup_printf("legacy-%s", props->name);
702+
703703
if (object_property_get_type(OBJECT(dev), legacy_name, NULL)) {
704-
value = object_property_get_str(OBJECT(dev), legacy_name, &err);
704+
value = object_property_get_str(OBJECT(dev), legacy_name, NULL);
705705
} else {
706-
value = object_property_print(OBJECT(dev), props->name, true, &err);
706+
value = object_property_print(OBJECT(dev), props->name, true,
707+
NULL);
707708
}
708709
g_free(legacy_name);
709710

710-
if (err) {
711-
error_free(err);
711+
if (!value) {
712712
continue;
713713
}
714714
qdev_printf("%s = %s\n", props->name,
715-
value && *value ? value : "<null>");
715+
*value ? value : "<null>");
716716
g_free(value);
717717
}
718718
}

0 commit comments

Comments
 (0)