[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 22/28] migration: final handshake for the resume
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v6 22/28] migration: final handshake for the resume |
Date: |
Thu, 8 Feb 2018 18:31:26 +0800 |
Finish the last step to do the final handshake for the recovery.
First source sends one MIG_CMD_RESUME to dst, telling that source is
ready to resume.
Then, dest replies with MIG_RP_MSG_RESUME_ACK to source, telling that
dest is ready to resume (after switch to postcopy-active state).
When source received the RESUME_ACK, it switches its state to
postcopy-active, and finally the recovery is completed.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
migration/migration.c | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index c2ecebda02..19cb95fa0e 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1851,7 +1851,8 @@ static int migrate_handle_rp_resume_ack(MigrationState
*s, uint32_t value)
migrate_set_state(&s->state, MIGRATION_STATUS_POSTCOPY_RECOVER,
MIGRATION_STATUS_POSTCOPY_ACTIVE);
- /* TODO: notify send thread that time to continue send pages */
+ /* Notify send thread that time to continue send pages */
+ qemu_sem_post(&s->rp_state.rp_sem);
return 0;
}
@@ -2378,6 +2379,21 @@ typedef enum MigThrError {
MIG_THR_ERR_FATAL = 2,
} MigThrError;
+static int postcopy_resume_handshake(MigrationState *s)
+{
+ qemu_savevm_send_postcopy_resume(s->to_dst_file);
+
+ while (s->state == MIGRATION_STATUS_POSTCOPY_RECOVER) {
+ qemu_sem_wait(&s->rp_state.rp_sem);
+ }
+
+ if (s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) {
+ return 0;
+ }
+
+ return -1;
+}
+
/* Return zero if success, or <0 for error */
static int postcopy_do_resume(MigrationState *s)
{
@@ -2395,10 +2411,14 @@ static int postcopy_do_resume(MigrationState *s)
}
/*
- * TODO: handshake with dest using MIG_CMD_RESUME,
- * MIG_RP_MSG_RESUME_ACK, then switch source state to
- * "postcopy-active"
+ * Last handshake with destination on the resume (destination will
+ * switch to postcopy-active afterwards)
*/
+ ret = postcopy_resume_handshake(s);
+ if (ret) {
+ error_report("%s: handshake failed: %d", __func__, ret);
+ return ret;
+ }
return 0;
}
--
2.14.3
- [Qemu-devel] [PATCH v6 15/28] migration: new cmd MIG_CMD_RECV_BITMAP, (continued)
- [Qemu-devel] [PATCH v6 15/28] migration: new cmd MIG_CMD_RECV_BITMAP, Peter Xu, 2018/02/08
- [Qemu-devel] [PATCH v6 16/28] migration: new message MIG_RP_MSG_RECV_BITMAP, Peter Xu, 2018/02/08
- [Qemu-devel] [PATCH v6 17/28] migration: new cmd MIG_CMD_POSTCOPY_RESUME, Peter Xu, 2018/02/08
- [Qemu-devel] [PATCH v6 18/28] migration: new message MIG_RP_MSG_RESUME_ACK, Peter Xu, 2018/02/08
- [Qemu-devel] [PATCH v6 19/28] migration: introduce SaveVMHandlers.resume_prepare, Peter Xu, 2018/02/08
- [Qemu-devel] [PATCH v6 20/28] migration: synchronize dirty bitmap for resume, Peter Xu, 2018/02/08
- [Qemu-devel] [PATCH v6 21/28] migration: setup ramstate for resume, Peter Xu, 2018/02/08
- [Qemu-devel] [PATCH v6 23/28] migration: init dst in migration_object_init too, Peter Xu, 2018/02/08
- [Qemu-devel] [PATCH v6 22/28] migration: final handshake for the resume,
Peter Xu <=
- [Qemu-devel] [PATCH v6 25/28] qmp/migration: new command migrate-recover, Peter Xu, 2018/02/08
- [Qemu-devel] [PATCH v6 24/28] io: let watcher of the channel run in same ctx, Peter Xu, 2018/02/08
- [Qemu-devel] [PATCH v6 26/28] hmp/migration: add migrate_recover command, Peter Xu, 2018/02/08
- [Qemu-devel] [PATCH v6 27/28] migration/qmp: add command migrate-pause, Peter Xu, 2018/02/08