Skip to contentSkip to conversation

migration: Fix block migration flag case

PATCH In review Dr. David Alan Gilbert (git) 2 participants 2 messages Mar 16, 2018 – Mar 19, 2018

lore
Share & tools
lore

Dr. David Alan Gilbert (git)

author
#0 lore raw

PATCH 1/1 migration: Fix block migration flag case

From: "Dr. David Alan Gilbert" <[email protected]>

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 <[email protected]>
---
 migration/migration.c | 1 +
 1 file changed, 1 insertion(+)
migration/migration.c +1 -0
index 1f22f463d3..20084b32dd 100644
@@ -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;
     }
Signature · 1 line
2.14.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

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 <[email protected]>
Reviewed-by Peter Xu <[email protected]>
Signature · 1 line
Peter Xu