Re: [PATCH-for-5.1 v3 4/7] migration/colo: Add missing error-propagation code

[Dr. David Alan Gilbert]

* Philippe Mathieu-Daudé (address@hidden) wrote:
> Running the coccinelle script produced:
> 
>   $ spatch \
>     --macro-file scripts/cocci-macro-file.h --include-headers \
>     --sp-file scripts/coccinelle/find-missing-error_propagate.cocci \
>     --keep-comments --smpl-spacing --dir .
>   HANDLING: ./migration/colo.c
>   [[manual check required: error_propagate() might be missing in 
> migrate_set_block_enabled() ./migration/colo.c:439:4]]
> 
> Add the missing error_propagate() after review.
> 
> Reviewed-by: Juan Quintela <address@hidden>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>

Queued this entry for migration

> ---
>  migration/colo.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/migration/colo.c b/migration/colo.c
> index a54ac84f41..57b2adb0cc 100644
> --- a/migration/colo.c
> +++ b/migration/colo.c
> @@ -437,6 +437,9 @@ static int colo_do_checkpoint_transaction(MigrationState 
> *s,
>  
>      /* Disable block migration */
>      migrate_set_block_enabled(false, &local_err);
> +    if (local_err) {
> +        goto out;
> +    }
>      qemu_mutex_lock_iothread();
>  
>  #ifdef CONFIG_REPLICATION
> -- 
> 2.21.1
> 
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK