Message ID | 20180316202114.32345-1-dgilbert@redhat.com |
---|---|
State | New |
Headers | show |
Series | migration: Fix block migration flag case | expand |
On Fri, Mar 16, 2018 at 08:21:14PM +0000, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > 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> Reviewed-by: Peter Xu <peterx@redhat.com>
diff --git a/migration/migration.c b/migration/migration.c index 1f22f463d3..20084b32dd 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1423,6 +1423,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; }