From: Dr. David Alan Gilbert Date: Thu, 19 Jul 2018 09:22:57 +0000 (+0100) Subject: migrate: Fix cancelling state warning X-Git-Tag: v3.0.0-rc2~1^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57225e5f32bb051c9eb03758647963aeb72cebbf;p=thirdparty%2Fqemu.git 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 Message-Id: <20180719092257.12703-1-dgilbert@redhat.com> Reviewed-by: Peter Xu Reviewed-by: Juan Quintela Signed-off-by: Dr. David Alan Gilbert --- diff --git a/migration/migration.c b/migration/migration.c index 8d56d569305..db6bde74538 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 {