diff options
| author | Dr. David Alan Gilbert | 2018-07-19 11:22:57 +0200 |
|---|---|---|
| committer | Dr. David Alan Gilbert | 2018-07-24 18:00:45 +0200 |
| commit | 57225e5f32bb051c9eb03758647963aeb72cebbf (patch) | |
| tree | e0b4981785c7bb94cd5a54283800f88b49e39ace | |
| parent | migration: fix potential overflow in multifd send (diff) | |
| download | qemu-57225e5f32bb051c9eb03758647963aeb72cebbf.tar.gz qemu-57225e5f32bb051c9eb03758647963aeb72cebbf.tar.xz qemu-57225e5f32bb051c9eb03758647963aeb72cebbf.zip | |
migrate: Fix cancelling state warning
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>
Message-Id: <20180719092257.12703-1-dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
| -rw-r--r-- | migration/migration.c | 1 |
1 files changed, 1 insertions, 0 deletions
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 { |