mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 15:53:54 -06:00
error: Remove NULL checks on error_propagate() calls
error_propagate() already ignores local_err==NULL, so there's no need to check it before calling. Coccinelle patch used to perform the changes added to scripts/coccinelle/error_propagate_null.cocci. Reviewed-by: Eric Blake <eblake@redhat.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <1465855078-19435-2-git-send-email-ehabkost@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
da002526ac
commit
621ff94d50
16 changed files with 41 additions and 93 deletions
12
blockdev.c
12
blockdev.c
|
@ -3644,9 +3644,7 @@ void qmp_drive_mirror(const char *device, const char *target,
|
|||
has_unmap, unmap,
|
||||
&local_err);
|
||||
bdrv_unref(target_bs);
|
||||
if (local_err) {
|
||||
error_propagate(errp, local_err);
|
||||
}
|
||||
error_propagate(errp, local_err);
|
||||
out:
|
||||
aio_context_release(aio_context);
|
||||
}
|
||||
|
@ -3701,9 +3699,7 @@ void qmp_blockdev_mirror(const char *device, const char *target,
|
|||
has_on_target_error, on_target_error,
|
||||
true, true,
|
||||
&local_err);
|
||||
if (local_err) {
|
||||
error_propagate(errp, local_err);
|
||||
}
|
||||
error_propagate(errp, local_err);
|
||||
|
||||
aio_context_release(aio_context);
|
||||
}
|
||||
|
@ -3913,9 +3909,7 @@ void qmp_change_backing_file(const char *device,
|
|||
|
||||
if (ro) {
|
||||
bdrv_reopen(image_bs, open_flags, &local_err);
|
||||
if (local_err) {
|
||||
error_propagate(errp, local_err); /* will preserve prior errp */
|
||||
}
|
||||
error_propagate(errp, local_err);
|
||||
}
|
||||
|
||||
out:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue