From: Dr. David Alan Gilbert Date: Fri, 16 Mar 2018 20:21:14 +0000 (+0000) Subject: migration: Fix block migration flag case X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=09576e74dbe697c5f0a7bc2ad7b59601457a2ff4;p=qemu.git migration: Fix block migration flag case Fix the case where when a migration with a bad protocol is tried, we leave the block migration capability set. (This is a cut down version of my 'migration: Fix block failure cases' where it's other case was fixed by Peter's dd0ee30caeebbd ) Signed-off-by: Dr. David Alan Gilbert Message-Id: <20180316202114.32345-1-dgilbert@redhat.com> Reviewed-by: Peter Xu Signed-off-by: Dr. David Alan Gilbert --- diff --git a/migration/migration.c b/migration/migration.c index fc629e5965..52a5092add 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1428,6 +1428,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, "a valid migration protocol"); migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED); + block_cleanup_parameters(s); return; }