[Qemu-devel] Re: [PATCH 3/3] propagate error on failed completion

[Yaniv Kamay <ykamay@redhat.com>]

Glauber Costa wrote:
> migrate_fd_put_ready() calls qemu_savevm_state_complete(),
> but the later can fail.
>
> If it happens, re-start the vm and propagate the error up
>
> Based on a patch by Yaniv Kamay
>
> Signed-off-by: Glauber Costa <glommer@redhat.com>
> CC: Yaniv Kamay <ykamay@redhat.com>
> CC: Dor Laor <dlaor@redhat.com>
> ---
>  migration.c |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/migration.c b/migration.c
> index b3904b2..d77ebbd 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -224,7 +224,11 @@ void migrate_fd_put_ready(void *opaque)
>          vm_stop(0);
>  
>          bdrv_flush_all();
> -        qemu_savevm_state_complete(s->file);
> +        if ((qemu_savevm_state_complete(s->file)) < 0) {
> +            vm_start();
> +            s->state = MIG_STATE_ERROR;
> +            return;
> +        }
>          s->state = MIG_STATE_COMPLETED;
>          migrate_fd_cleanup(s);
>      }
>   
We need to call migrate_fd_cleanup() in case of error.

Yaniv