diff options
| -rw-r--r-- | migration/savevm.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/migration/savevm.c b/migration/savevm.c index 0ad1b93a8b..c469bad65c 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1399,6 +1399,8 @@ static void *postcopy_ram_listen_thread(void *opaque) MigrationIncomingState *mis = migration_incoming_get_current(); int load_res; + migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, + MIGRATION_STATUS_POSTCOPY_ACTIVE); qemu_sem_post(&mis->listen_thread_sem); trace_postcopy_ram_listen_thread_start(); @@ -1415,6 +1417,8 @@ static void *postcopy_ram_listen_thread(void *opaque) if (load_res < 0) { error_report("%s: loadvm failed: %d", __func__, load_res); qemu_file_set_error(f, load_res); + migrate_set_state(&mis->state, MIGRATION_STATUS_POSTCOPY_ACTIVE, + MIGRATION_STATUS_FAILED); } else { /* * This looks good, but it's possible that the device loading in the @@ -1424,13 +1428,6 @@ static void *postcopy_ram_listen_thread(void *opaque) qemu_event_wait(&mis->main_thread_load_event); } postcopy_ram_incoming_cleanup(mis); - /* - * If everything has worked fine, then the main thread has waited - * for us to start, and we're the last use of the mis. - * (If something broke then qemu will have to exit anyway since it's - * got a bad migration state). - */ - migration_incoming_state_destroy(); if (load_res < 0) { /* @@ -1442,6 +1439,17 @@ static void *postcopy_ram_listen_thread(void *opaque) exit(EXIT_FAILURE); } + migrate_set_state(&mis->state, MIGRATION_STATUS_POSTCOPY_ACTIVE, + MIGRATION_STATUS_COMPLETED); + /* + * If everything has worked fine, then the main thread has waited + * for us to start, and we're the last use of the mis. + * (If something broke then qemu will have to exit anyway since it's + * got a bad migration state). + */ + migration_incoming_state_destroy(); + + return NULL; } |