[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/27] migration: assert colo instead of check
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 15/27] migration: assert colo instead of check |
Date: |
Mon, 15 Jan 2018 12:52:57 +0100 |
From: Peter Xu <address@hidden>
When reaching here if we are still "active" it means we must be in colo
state. After a quick discussion offlist, we decided to use the safer
error_report().
Finally I want to use "switch" here rather than lots of complicated if
clauses.
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/migration.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/migration/migration.c b/migration/migration.c
index 7a77b193c1..f579752d21 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2348,7 +2348,15 @@ static void *migration_thread(void *opaque)
}
runstate_set(RUN_STATE_POSTMIGRATE);
} else {
- if (s->state == MIGRATION_STATUS_ACTIVE && enable_colo) {
+ if (s->state == MIGRATION_STATUS_ACTIVE) {
+ /*
+ * We should really assert here, but since it's during
+ * migration, let's try to reduce the usage of assertions.
+ */
+ if (!enable_colo) {
+ error_report("%s: critical error: calling COLO code without "
+ "COLO enabled", __func__);
+ }
migrate_start_colo_process(s);
qemu_savevm_state_cleanup();
/*
--
2.14.3
- [Qemu-devel] [PULL 06/27] migration: fix analyze-migration.py script with radix table, (continued)
- [Qemu-devel] [PULL 06/27] migration: fix analyze-migration.py script with radix table, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 07/27] migration: introduce postcopy-blocktime capability, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 08/27] migration: add postcopy blocktime ctx into MigrationIncomingState, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 09/27] migration: calculate vCPU blocktime on dst side, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 10/27] migration: postcopy_blocktime documentation, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 11/27] migration: add blocktime calculation into migration-test, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 12/27] migration: add postcopy total blocktime into query-migrate, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 13/27] migration: Guard ram_bytes_remaining against early call, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 14/27] migration: finalize current_migration object, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 16/27] migration: qemu_savevm_state_cleanup() in cleanup, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 15/27] migration: assert colo instead of check,
Juan Quintela <=
- [Qemu-devel] [PULL 17/27] migration: remove "enable_colo" var, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 18/27] migration: split use of MigrationState.total_time, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 19/27] migration: move vm_old_running into global state, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 20/27] migration: introduce downtime_start, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 21/27] migration: introduce migrate_calculate_complete, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 23/27] migration: cleanup stats update into function, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 22/27] migration: use switch at the end of migration, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 24/27] migration: major cleanup for migrate iterations, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 26/27] migration: remove some block_cleanup_parameters(), Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 25/27] migration: put the finish part into a new function, Juan Quintela, 2018/01/15