qdev: Ignore Error objects where the return value suffices
Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20200707160613.848843-45-armbru@redhat.com>
This commit is contained in:
parent
9e194e063f
commit
2d226cf6d1
@ -742,7 +742,6 @@ static void set_pci_devfn(Object *obj, Visitor *v, const char *name,
|
||||
Property *prop = opaque;
|
||||
int32_t value, *ptr = qdev_get_prop_ptr(dev, prop);
|
||||
unsigned int slot, fn, n;
|
||||
Error *local_err = NULL;
|
||||
char *str;
|
||||
|
||||
if (dev->realized) {
|
||||
@ -750,9 +749,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, const char *name,
|
||||
return;
|
||||
}
|
||||
|
||||
if (!visit_type_str(v, name, &str, &local_err)) {
|
||||
error_free(local_err);
|
||||
local_err = NULL;
|
||||
if (!visit_type_str(v, name, &str, NULL)) {
|
||||
if (!visit_type_int32(v, name, &value, errp)) {
|
||||
return;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user