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 --- migration/colo.c | 4 +--- migration/migration.c | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'migration') diff --git a/migration/colo.c b/migration/colo.c index 80788d46b5..3f1d3dfd95 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -798,9 +798,7 @@ static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, colo_send_message(mis->to_src_file, COLO_MESSAGE_VMSTATE_LOADED, &local_err); - if (local_err) { - error_propagate(errp, local_err); - } + error_propagate(errp, local_err); } static void colo_wait_handle_message(MigrationIncomingState *mis, diff --git a/migration/migration.c b/migration/migration.c index aca7fdcd0b..0575ecb379 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -623,9 +623,7 @@ void migration_fd_process_incoming(QEMUFile *f, Error **errp) } if (migration_incoming_setup(f, &local_err)) { - if (local_err) { - error_propagate(errp, local_err); - } + error_propagate(errp, local_err); return; } migration_incoming_process(); @@ -647,9 +645,7 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp) } if (migration_incoming_setup(f, &local_err)) { - if (local_err) { - error_propagate(errp, local_err); - } + error_propagate(errp, local_err); return; } -- cgit v1.2.3