[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/18] migration/colo: Optimize COLO primary node start code path
From: |
Juan Quintela |
Subject: |
[PULL 04/18] migration/colo: Optimize COLO primary node start code path |
Date: |
Wed, 15 Dec 2021 11:32:04 +0100 |
From: Zhang Chen <chen.zhang@intel.com>
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>
---
migration/colo.c | 2 --
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:
--
2.33.1
- [PULL 00/18] Migration 20211214 patches, Juan Quintela, 2021/12/15
- [PULL 01/18] migration/ram.c: Remove the qemu_mutex_lock in colo_flush_ram_cache., Juan Quintela, 2021/12/15
- [PULL 03/18] Fixed a QEMU hang when guest poweroff in COLO mode, Juan Quintela, 2021/12/15
- [PULL 04/18] migration/colo: Optimize COLO primary node start code path,
Juan Quintela <=
- [PULL 05/18] migration: Remove is_zero_range(), Juan Quintela, 2021/12/15
- [PULL 06/18] dump: Remove is_zero_page(), Juan Quintela, 2021/12/15
- [PULL 08/18] migration: Never call twice qemu_target_page_size(), Juan Quintela, 2021/12/15
- [PULL 02/18] migration/colo: More accurate update checkpoint time, Juan Quintela, 2021/12/15
- [PULL 11/18] multifd: The variable is only used inside the loop, Juan Quintela, 2021/12/15
- [PULL 09/18] multifd: Rename used field to num, Juan Quintela, 2021/12/15
- [PULL 07/18] multifd: Delete useless operation, Juan Quintela, 2021/12/15
- [PULL 12/18] multifd: remove used parameter from send_prepare() method, Juan Quintela, 2021/12/15
- [PULL 10/18] multifd: Add missing documention, Juan Quintela, 2021/12/15
- [PULL 13/18] multifd: remove used parameter from send_recv_pages() method, Juan Quintela, 2021/12/15