[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/13] migration: put the finish part into a new
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v2 11/13] migration: put the finish part into a new function |
Date: |
Wed, 3 Jan 2018 20:20:15 +0800 |
This patch only moved the last part of migration_thread() into a new
function migration_iteration_finish() to make it much shorter. With
previous works to remove some local variables, now it's fairly easy to
do that.
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
migration/migration.c | 94 +++++++++++++++++++++++++++------------------------
1 file changed, 49 insertions(+), 45 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 2b42d6c9a1..16eb24c8b3 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2254,6 +2254,54 @@ static MigIterateState
migration_iteration_run(MigrationState *s)
return MIG_ITERATE_RESUME;
}
+static void migration_iteration_finish(MigrationState *s)
+{
+ /* If we enabled cpu throttling for auto-converge, turn it off. */
+ cpu_throttle_stop();
+
+ qemu_mutex_lock_iothread();
+ switch (s->state) {
+ case MIGRATION_STATUS_COMPLETED:
+ 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.
+ */
+ if (!migrate_colo_enabled()) {
+ error_report("%s: critical error: calling COLO code without "
+ "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.
+ */
+ s->vm_was_running = true;
+ /* Fallthrough */
+ case MIGRATION_STATUS_FAILED:
+ case MIGRATION_STATUS_CANCELLED:
+ if (s->vm_was_running) {
+ vm_start();
+ } else {
+ if (runstate_check(RUN_STATE_FINISH_MIGRATE)) {
+ runstate_set(RUN_STATE_POSTMIGRATE);
+ }
+ }
+ break;
+
+ default:
+ /* Should not reach here, but if so, forgive the VM. */
+ error_report("%s: Unknown ending state %d", __func__, s->state);
+ break;
+ }
+ qemu_bh_schedule(s->cleanup_bh);
+ qemu_mutex_unlock_iothread();
+}
+
/*
* Master migration thread on the source VM.
* It drives the migration and pumps the data down the outgoing channel.
@@ -2332,51 +2380,7 @@ static void *migration_thread(void *opaque)
}
trace_migration_thread_after_loop();
- /* If we enabled cpu throttling for auto-converge, turn it off. */
- cpu_throttle_stop();
-
- qemu_mutex_lock_iothread();
- switch (s->state) {
- case MIGRATION_STATUS_COMPLETED:
- 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.
- */
- if (!migrate_colo_enabled()) {
- error_report("%s: critical error: calling COLO code without "
- "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.
- */
- s->vm_was_running = true;
- /* Fallthrough */
- case MIGRATION_STATUS_FAILED:
- case MIGRATION_STATUS_CANCELLED:
- if (s->vm_was_running) {
- vm_start();
- } else {
- if (runstate_check(RUN_STATE_FINISH_MIGRATE)) {
- runstate_set(RUN_STATE_POSTMIGRATE);
- }
- }
- break;
-
- default:
- /* Should not reach here, but if so, forgive the VM. */
- error_report("%s: Unknown ending state %d", __func__, s->state);
- break;
- }
- qemu_bh_schedule(s->cleanup_bh);
- qemu_mutex_unlock_iothread();
-
+ migration_iteration_finish(s);
rcu_unregister_thread();
return NULL;
}
--
2.14.3
- Re: [Qemu-devel] [PATCH v2 04/13] migration: split use of MigrationState.total_time, (continued)
- [Qemu-devel] [PATCH v2 05/13] migration: move vm_old_running into global state, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 06/13] migration: introduce downtime_start, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 07/13] migration: introduce migrate_calculate_complete, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 08/13] migration: use switch at the end of migration, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 09/13] migration: cleanup stats update into function, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 10/13] migration: major cleanup for migrate iterations, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 11/13] migration: put the finish part into a new function,
Peter Xu <=
- [Qemu-devel] [PATCH v2 12/13] migration: remove some block_cleanup_parameters(), Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 13/13] migration: remove notify in fd_error, Peter Xu, 2018/01/03