migration/migration.c: Avoid COLO boot in postcopy migration
COLO dose not support postcopy migration and remove the Fixme. Signed-off-by: Zhang Chen <chen.zhang@intel.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
parent
444252b96a
commit
eeeb48ee33
@ -3230,7 +3230,11 @@ static void migration_completion(MigrationState *s)
|
||||
goto fail_invalidate;
|
||||
}
|
||||
|
||||
if (!migrate_colo_enabled()) {
|
||||
if (migrate_colo_enabled() && s->state == MIGRATION_STATUS_ACTIVE) {
|
||||
/* COLO does not support postcopy */
|
||||
migrate_set_state(&s->state, MIGRATION_STATUS_ACTIVE,
|
||||
MIGRATION_STATUS_COLO);
|
||||
} else {
|
||||
migrate_set_state(&s->state, current_active_state,
|
||||
MIGRATION_STATUS_COMPLETED);
|
||||
}
|
||||
@ -3621,10 +3625,6 @@ static void migration_iteration_finish(MigrationState *s)
|
||||
"COLO enabled", __func__);
|
||||
}
|
||||
migrate_start_colo_process(s);
|
||||
/*
|
||||
* Fixme: we will run VM in COLO no matter its old running state.
|
||||
* After exited COLO, we will keep running.
|
||||
*/
|
||||
/* Fallthrough */
|
||||
case MIGRATION_STATUS_ACTIVE:
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user