Skip to content

Commit 2d226cf

Browse files
author
Markus Armbruster
committed
qdev: Ignore Error objects where the return value suffices
Signed-off-by: Markus Armbruster <[email protected]> Reviewed-by: Eric Blake <[email protected]> Message-Id: <[email protected]>
1 parent 9e194e0 commit 2d226cf

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

hw/core/qdev-properties.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -742,17 +742,14 @@ static void set_pci_devfn(Object *obj, Visitor *v, const char *name,
742742
Property *prop = opaque;
743743
int32_t value, *ptr = qdev_get_prop_ptr(dev, prop);
744744
unsigned int slot, fn, n;
745-
Error *local_err = NULL;
746745
char *str;
747746

748747
if (dev->realized) {
749748
qdev_prop_set_after_realize(dev, name, errp);
750749
return;
751750
}
752751

753-
if (!visit_type_str(v, name, &str, &local_err)) {
754-
error_free(local_err);
755-
local_err = NULL;
752+
if (!visit_type_str(v, name, &str, NULL)) {
756753
if (!visit_type_int32(v, name, &value, errp)) {
757754
return;
758755
}

0 commit comments

Comments
 (0)