david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

End of migration for postcopy

Browse Source 
Tweak the end of migration cleanup; we don't want to close stuff down
at the end of the main stream, since the postcopy is still sending pages
on the other thread.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2015-11-05 18:11:21 +00:00 committed by Juan Quintela
parent f952710757
commit e9bef235d9
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
migration/migration.c
View File

@ -325,13 +325,37 @@ static void process_incoming_migration_co(void *opaque)
{ {
QEMUFile *f = opaque; QEMUFile *f = opaque;
Error *local_err = NULL; Error *local_err = NULL;
MigrationIncomingState *mis;
PostcopyState ps;
int ret; int ret;
migration_incoming_state_new(f); mis = migration_incoming_state_new(f);
postcopy_state_set(POSTCOPY_INCOMING_NONE); postcopy_state_set(POSTCOPY_INCOMING_NONE);
migrate_generate_event(MIGRATION_STATUS_ACTIVE); migrate_generate_event(MIGRATION_STATUS_ACTIVE);
ret = qemu_loadvm_state(f); ret = qemu_loadvm_state(f);
ps = postcopy_state_get();
trace_process_incoming_migration_co_end(ret, ps);
if (ps != POSTCOPY_INCOMING_NONE) {
if (ps == POSTCOPY_INCOMING_ADVISE) {
/*
* Where a migration had postcopy enabled (and thus went to advise)
* but managed to complete within the precopy period, we can use
* the normal exit.
*/
postcopy_ram_incoming_cleanup(mis);
} else if (ret >= 0) {
/*
* Postcopy was started, cleanup should happen at the end of the
* postcopy thread.
*/
trace_process_incoming_migration_co_postcopy_end_main();
return;
}
/* Else if something went wrong then just fall out of the normal exit */
}
qemu_fclose(f); qemu_fclose(f);
free_xbzrle_decoded_buf(); free_xbzrle_decoded_buf();
migration_incoming_state_destroy(); migration_incoming_state_destroy();

6
trace-events
View File

@ -1480,11 +1480,13 @@ source_return_path_thread_entry(void) ""
source_return_path_thread_loop_top(void) "" source_return_path_thread_loop_top(void) ""
source_return_path_thread_pong(uint32_t val) "%x" source_return_path_thread_pong(uint32_t val) "%x"
source_return_path_thread_shut(uint32_t val) "%x" source_return_path_thread_shut(uint32_t val) "%x"
migrate_transferred(uint64_t tranferred, uint64_t time_spent, double bandwidth, uint64_t size) "transferred %" PRIu64 " time_spent %" PRIu64 " bandwidth %g max_size %" PRId64
migrate_state_too_big(void) ""
migrate_global_state_post_load(const char *state) "loaded state: %s" migrate_global_state_post_load(const char *state) "loaded state: %s"
migrate_global_state_pre_save(const char *state) "saved state: %s" migrate_global_state_pre_save(const char *state) "saved state: %s"
migration_thread_low_pending(uint64_t pending) "%" PRIu64 migration_thread_low_pending(uint64_t pending) "%" PRIu64
migrate_state_too_big(void) ""
migrate_transferred(uint64_t tranferred, uint64_t time_spent, double bandwidth, uint64_t size) "transferred %" PRIu64 " time_spent %" PRIu64 " bandwidth %g max_size %" PRId64
process_incoming_migration_co_end(int ret, int ps) "ret=%d postcopy-state=%d"
process_incoming_migration_co_postcopy_end_main(void) ""
# migration/rdma.c # migration/rdma.c
qemu_rdma_accept_incoming_migration(void) "" qemu_rdma_accept_incoming_migration(void) ""