aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2020-07-07 18:06:05 +0200
committerMarkus Armbruster <armbru@redhat.com>2020-07-10 15:18:08 +0200
commita5f9b9df252d0dfb407178ef4c3769f78a64b2ff (patch)
tree3332a93b91cc71e15b74b9cb566451397c1ff387 /hw
parent992861fb1e4cf410f30ec8f05bd2dc2a14a5a027 (diff)
error: Reduce unnecessary error propagation
When all we do with an Error we receive into a local variable is propagating to somewhere else, we can just as well receive it there right away, even when we need to keep error_propagate() for other error paths. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20200707160613.848843-38-armbru@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/core/qdev.c2
-rw-r--r--hw/net/virtio-net.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 68948761f2..01796823b4 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -871,7 +871,7 @@ static void device_set_realized(Object *obj, bool value, Error **errp)
}
if (value && !dev->realized) {
- if (!check_only_migratable(obj, &local_err)) {
+ if (!check_only_migratable(obj, errp)) {
goto fail;
}
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 48b07eb921..10cc958396 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -3138,8 +3138,8 @@ static bool failover_replug_primary(VirtIONet *n, Error **errp)
qdev_set_parent_bus(n->primary_dev, n->primary_bus);
n->primary_should_be_hidden = false;
if (!qemu_opt_set_bool(n->primary_device_opts,
- "partially_hotplugged", true, &err)) {
- goto out;
+ "partially_hotplugged", true, errp)) {
+ return false;
}
hotplug_ctrl = qdev_get_hotplug_handler(n->primary_dev);
if (hotplug_ctrl) {