diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-09 14:47:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-09 14:47:45 +0100 |
| commit | e1c30c43cd0bcb5c7a0877c7aa9ddc8f4a99afbc (patch) | |
| tree | d57853edbd09d7db0129f179d1436037d045a4b2 /hw/net | |
| parent | b7092cda1b36ce687e65ab1831346f9529b781b8 (diff) | |
| parent | 805d44961b9015716cc13c1d3e49457af3970d82 (diff) | |
| download | qemu-e1c30c43cd0bcb5c7a0877c7aa9ddc8f4a99afbc.zip qemu-e1c30c43cd0bcb5c7a0877c7aa9ddc8f4a99afbc.tar.gz qemu-e1c30c43cd0bcb5c7a0877c7aa9ddc8f4a99afbc.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2020-10-09' into staging
Error reporting patches for 2020-10-09
# gpg: Signature made Fri 09 Oct 2020 07:45:17 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-error-2020-10-09:
error: Use error_fatal to simplify obvious fatal errors (again)
error: Remove NULL checks on error_propagate() calls (again)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net')
| -rw-r--r-- | hw/net/virtio-net.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 7bf27b9..a160a9d 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -817,9 +817,7 @@ static void failover_add_primary(VirtIONet *n, Error **errp) "sure primary device has parameter" " failover_pair_id=<virtio-net-id>\n"); } - if (err) { - error_propagate(errp, err); - } + error_propagate(errp, err); } static int is_my_primary(void *opaque, QemuOpts *opts, Error **errp) @@ -873,9 +871,7 @@ static DeviceState *virtio_connect_failover_devices(VirtIONet *n, n->primary_device_id = g_strdup(prim_dev->id); n->primary_device_opts = prim_dev->opts; } else { - if (err) { - error_propagate(errp, err); - } + error_propagate(errp, err); } return prim_dev; |