Re: [Qemu-devel] [PATCH v3 6/7] migration: allow cancel to unpause

[Peter Xu <peterx@redhat.com>]

On Wed, Oct 18, 2017 at 06:40:12PM +0100, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> 
> If a migration_cancel is issued during the new paused state,
> kick the pause_sem to get to unpause so it can cancel.
> 
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Reviewed-by: Peter Xu <peterx@redhat.com>

> ---
>  migration/migration.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index c9a3ee9efd..756deb3e2c 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -1108,6 +1108,10 @@ static void migrate_fd_cancel(MigrationState *s)
>          if (!migration_is_setup_or_active(old_state)) {
>              break;
>          }
> +        /* If the migration is paused, kick it out of the pause */
> +        if (old_state == MIGRATION_STATUS_PRE_SWITCHOVER) {
> +            qemu_sem_post(&s->pause_sem);
> +        }
>          migrate_set_state(&s->state, old_state, MIGRATION_STATUS_CANCELLING);
>      } while (s->state != MIGRATION_STATUS_CANCELLING);
>  
> -- 
> 2.13.6
> 

-- 
Peter Xu