diff options
| author | Zhang Chen <chen.zhang@intel.com> | 2021-11-17 16:30:02 +0800 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2021-12-15 10:31:42 +0100 |
| commit | 751fe4c608b6e83ea3c19fff2bdbea19645c398f (patch) | |
| tree | 0f9280e4a05b5eadfe5c8e5dce1ef1eef2b5587e | |
| parent | 795969ab1fe6d5a0f524be92e2e1ecd13f1873eb (diff) | |
| download | qemu-751fe4c608b6e83ea3c19fff2bdbea19645c398f.zip | |
migration/colo: Optimize COLO primary node start code path
Optimize COLO primary start path from:
MIGRATION_STATUS_XXX --> MIGRATION_STATUS_ACTIVE --> MIGRATION_STATUS_COLO --> MIGRATION_STATUS_COMPLETED
To:
MIGRATION_STATUS_XXX --> MIGRATION_STATUS_COLO --> MIGRATION_STATUS_COMPLETED
No need to start primary COLO through "MIGRATION_STATUS_ACTIVE".
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | migration/colo.c | 2 | ||||
| -rw-r--r-- | migration/migration.c | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/migration/colo.c b/migration/colo.c index 2a85504966..4a772afe78 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -666,8 +666,6 @@ void migrate_start_colo_process(MigrationState *s) colo_checkpoint_notify, s); qemu_sem_init(&s->colo_exit_sem, 0); - migrate_set_state(&s->state, MIGRATION_STATUS_ACTIVE, - MIGRATION_STATUS_COLO); colo_process_checkpoint(s); qemu_mutex_lock_iothread(); } diff --git a/migration/migration.c b/migration/migration.c index c0ab86e9a5..2c1edb2cb9 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3613,12 +3613,7 @@ static void migration_iteration_finish(MigrationState *s) migration_calculate_complete(s); runstate_set(RUN_STATE_POSTMIGRATE); break; - - case MIGRATION_STATUS_ACTIVE: - /* - * We should really assert here, but since it's during - * migration, let's try to reduce the usage of assertions. - */ + case MIGRATION_STATUS_COLO: if (!migrate_colo_enabled()) { error_report("%s: critical error: calling COLO code without " "COLO enabled", __func__); @@ -3628,6 +3623,12 @@ static void migration_iteration_finish(MigrationState *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: + /* + * We should really assert here, but since it's during + * migration, let's try to reduce the usage of assertions. + */ s->vm_was_running = true; /* Fallthrough */ case MIGRATION_STATUS_FAILED: |