aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDr. David Alan Gilbert <dgilbert@redhat.com>2018-03-16 20:21:14 +0000
committerDr. David Alan Gilbert <dgilbert@redhat.com>2018-03-23 18:24:11 +0000
commit09576e74dbe697c5f0a7bc2ad7b59601457a2ff4 (patch)
tree3f5bb24dd6151c9663c03792a848d612157a28e4
parentb47d1e9fe09834d0640aedc002384b0600739075 (diff)
downloadqemu-09576e74dbe697c5f0a7bc2ad7b59601457a2ff4.zip
qemu-09576e74dbe697c5f0a7bc2ad7b59601457a2ff4.tar.gz
qemu-09576e74dbe697c5f0a7bc2ad7b59601457a2ff4.tar.bz2
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 <dgilbert@redhat.com> Message-Id: <20180316202114.32345-1-dgilbert@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-rw-r--r--migration/migration.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/migration/migration.c b/migration/migration.c
index fc629e5..52a5092 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;
}