vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
master
Markus Armbruster 2020-07-22 10:40:47 +02:00
parent 497d415d76
commit 2155ceaf25
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/net/virtio-net.c
View File

@ -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;

4
migration/colo.c
View File

@ -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,

8
migration/migration.c
View File

@ -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;
}