From 2155ceaf25662aa53cdb9dec3d7e9458bad4f0e0 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 22 Jul 2020 10:40:47 +0200 Subject: error: Remove NULL checks on error_propagate() calls (again) Patch created mechanically by rerunning: $ spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \ --macro-file scripts/cocci-macro-file.h \ --use-gitgrep . Cc: Jens Freimann Cc: Hailiang Zhang Cc: Juan Quintela Signed-off-by: Markus Armbruster Message-Id: <20200722084048.1726105-4-armbru@redhat.com> Reviewed-by: Eric Blake --- hw/net/virtio-net.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'hw/net') diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 7bf27b9db7..a160a9da9c 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=\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; -- cgit v1.2.3