* Zhang Chen (chen.zh...@intel.com) wrote:
> COLO dose not support postcopy migration and remove the Fixme.
'does' not 'dose'
> Signed-off-by: Zhang Chen <chen.zh...@intel.com>
> ---
> migration/migration.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/migration/migration.c b/migration/migration.c
> index 2afa77da03..3fac9c67ca 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -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 dose not support postcopy */
> + migrate_set_state(&s->state, MIGRATION_STATUS_ACTIVE,
> + MIGRATION_STATUS_COLO);
I'm a bit confused; where were we setting the source state to COLO
before - I can't find it!
Dave
> + } 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:
> /*
> --
> 2.25.1
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
