ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: final handshake for the resume 

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 <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20180502104740.12123-19-peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Peter Xu 2018-05-02 18:47:34 +08:00 committed by Juan Quintela
parent 08614f3497
commit 9419069695
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
migration/migration.c
View File

@ -1924,7 +1924,8 @@ static int migrate_handle_rp_resume_ack(MigrationState *s, uint32_t value)
migrate_set_state(&s->state, MIGRATION_STATUS_POSTCOPY_RECOVER, migrate_set_state(&s->state, MIGRATION_STATUS_POSTCOPY_RECOVER,
MIGRATION_STATUS_POSTCOPY_ACTIVE); 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; return 0;
} }
@ -2451,6 +2452,21 @@ typedef enum MigThrError {
MIG_THR_ERR_FATAL = 2, MIG_THR_ERR_FATAL = 2,
} MigThrError; } 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 */ /* Return zero if success, or <0 for error */
static int postcopy_do_resume(MigrationState *s) static int postcopy_do_resume(MigrationState *s)
{ {
@ -2468,10 +2484,14 @@ static int postcopy_do_resume(MigrationState *s)
} }
/* /*
* TODO: handshake with dest using MIG_CMD_RESUME, * Last handshake with destination on the resume (destination will
* MIG_RP_MSG_RESUME_ACK, then switch source state to * switch to postcopy-active afterwards)
* "postcopy-active"
*/ */
ret = postcopy_resume_handshake(s);
if (ret) {
error_report("%s: handshake failed: %d", __func__, ret);
return ret;
}
return 0; return 0;
} }