aboutsummaryrefslogtreecommitdiff
path: root/migration
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2020-07-22 10:40:47 +0200
committerMarkus Armbruster <armbru@redhat.com>2020-10-09 08:36:23 +0200
commit2155ceaf25662aa53cdb9dec3d7e9458bad4f0e0 (patch)
tree82796e3e22368aea5163f4acc02a9971cd247b68 /migration
parent497d415d76b9f59fcae27f22df1ca2c3fa4df64e (diff)
downloadqemu-2155ceaf25662aa53cdb9dec3d7e9458bad4f0e0.zip
qemu-2155ceaf25662aa53cdb9dec3d7e9458bad4f0e0.tar.gz
qemu-2155ceaf25662aa53cdb9dec3d7e9458bad4f0e0.tar.bz2
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 <jfreimann@redhat.com> Cc: Hailiang Zhang <zhang.zhanghailiang@huawei.com> Cc: Juan Quintela <quintela@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20200722084048.1726105-4-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'migration')
-rw-r--r--migration/colo.c4
-rw-r--r--migration/migration.c8
2 files changed, 3 insertions, 9 deletions
diff --git a/migration/colo.c b/migration/colo.c
index 80788d4..3f1d3df 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 aca7fdc..0575ecb 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;
}