diff options
| author | Markus Armbruster | 2020-07-07 18:06:05 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2020-07-10 15:18:08 +0200 |
| commit | a5f9b9df252d0dfb407178ef4c3769f78a64b2ff (patch) | |
| tree | 3332a93b91cc71e15b74b9cb566451397c1ff387 /hw/net/virtio-net.c | |
| parent | error: Eliminate error_propagate() manually (diff) | |
| download | qemu-a5f9b9df252d0dfb407178ef4c3769f78a64b2ff.tar.gz qemu-a5f9b9df252d0dfb407178ef4c3769f78a64b2ff.tar.xz qemu-a5f9b9df252d0dfb407178ef4c3769f78a64b2ff.zip | |
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/net/virtio-net.c')
| -rw-r--r-- | hw/net/virtio-net.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |