From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

We've been getting the warning:

migration_iteration_finish: Unknown ending state 2

on a cancel.

I think that's originally due to 39b9e17905c;  although
I've only seen the warning, I think that in some cases
that we could find the VM stays paused after a cancel where
it should restart.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 migration/migration.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/migration/migration.c b/migration/migration.c
index 8d56d56930..db6bde7453 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2877,6 +2877,7 @@ static void migration_iteration_finish(MigrationState *s)
         /* Fallthrough */
     case MIGRATION_STATUS_FAILED:
     case MIGRATION_STATUS_CANCELLED:
+    case MIGRATION_STATUS_CANCELLING:
         if (s->vm_was_running) {
             vm_start();
         } else {
-- 
2.17.1

On Thu, Jul 19, 2018 at 10:22:57AM +0100, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> 
> We've been getting the warning:
> 
> migration_iteration_finish: Unknown ending state 2
> 
> on a cancel.
> 
> I think that's originally due to 39b9e17905c;  although
> I've only seen the warning, I think that in some cases
> that we could find the VM stays paused after a cancel where
> it should restart.
> 
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

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

-- 
Peter Xu

"Dr. David Alan Gilbert (git)" <dgilbert@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> We've been getting the warning:
>
> migration_iteration_finish: Unknown ending state 2
>
> on a cancel.
>
> I think that's originally due to 39b9e17905c;  although
> I've only seen the warning, I think that in some cases
> that we could find the VM stays paused after a cancel where
> it should restart.
>
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

* Dr. David Alan Gilbert (git) (dgilbert@redhat.com) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> 
> We've been getting the warning:
> 
> migration_iteration_finish: Unknown ending state 2
> 
> on a cancel.
> 
> I think that's originally due to 39b9e17905c;  although
> I've only seen the warning, I think that in some cases
> that we could find the VM stays paused after a cancel where
> it should restart.
> 
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Queued

> ---
>  migration/migration.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index 8d56d56930..db6bde7453 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -2877,6 +2877,7 @@ static void migration_iteration_finish(MigrationState *s)
>          /* Fallthrough */
>      case MIGRATION_STATUS_FAILED:
>      case MIGRATION_STATUS_CANCELLED:
> +    case MIGRATION_STATUS_CANCELLING:
>          if (s->vm_was_running) {
>              vm_start();
>          } else {
> -- 
> 2.17.1
> 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK