From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGqdC-0000Wm-2t for qemu-devel@nongnu.org; Mon, 11 Aug 2014 10:31:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XGqd5-0001Tv-PP for qemu-devel@nongnu.org; Mon, 11 Aug 2014 10:31:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28853) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGqd5-0001Tb-2y for qemu-devel@nongnu.org; Mon, 11 Aug 2014 10:31:19 -0400 From: "Dr. David Alan Gilbert (git)" Date: Mon, 11 Aug 2014 15:29:57 +0100 Message-Id: <1407767399-3030-42-git-send-email-dgilbert@redhat.com> In-Reply-To: <1407767399-3030-1-git-send-email-dgilbert@redhat.com> References: <1407767399-3030-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v2 41/43] postcopy: Wire up loadvm_postcopy_ram_handle_{run, end} commands List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aarcange@redhat.com, yamahata@private.email.ne.jp, lilei@linux.vnet.ibm.com, quintela@redhat.com From: "Dr. David Alan Gilbert" Wire up more of the handlers for the commands on the destination side, in particular loadvm_postcopy_ram_handle_run now has enough to start the guest running. Signed-off-by: Dr. David Alan Gilbert --- savevm.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 63 insertions(+), 5 deletions(-) diff --git a/savevm.c b/savevm.c index b2f51f7..77e4f88 100644 --- a/savevm.c +++ b/savevm.c @@ -1347,6 +1347,8 @@ static int loadvm_postcopy_ram_handle_listen(MigrationIncomingState *mis) /* After all discards we can start running and asking for pages */ static int loadvm_postcopy_ram_handle_run(MigrationIncomingState *mis) { + Error *local_err = NULL; + DPRINTF("%s", __func__); if (mis->postcopy_ram_state != POSTCOPY_RAM_INCOMING_LISTENING) { error_report("CMD_POSTCOPY_RAM_RUN in wrong postcopy state (%d)", @@ -1355,6 +1357,28 @@ static int loadvm_postcopy_ram_handle_run(MigrationIncomingState *mis) } mis->postcopy_ram_state = POSTCOPY_RAM_INCOMING_RUNNING; + + /* TODO we should move all of this lot into postcopy_ram.c or a shared code + * in migration.c + */ + cpu_synchronize_all_post_init(); + + qemu_announce_self(); + bdrv_clear_incoming_migration_all(); + + /* Make sure all file formats flush their mutable metadata */ + bdrv_invalidate_cache_all(&local_err); + if (local_err) { + qerror_report_err(local_err); + error_free(local_err); + return -1; + } + + DPRINTF("loadvm_postcopy_ram_handle_run: cpu_synchronize_all_post_init"); + cpu_synchronize_all_post_init(); + + DPRINTF("loadvm_postcopy_ram_handle_run: vm_start"); + if (autostart) { /* Hold onto your hats, starting the CPU */ vm_start(); @@ -1363,11 +1387,15 @@ static int loadvm_postcopy_ram_handle_run(MigrationIncomingState *mis) runstate_set(RUN_STATE_PAUSED); } - return 0; + return LOADVM_EXITCODE_QUITLOOP; } -/* The end - with a byte from the source which can tell us to fail. */ -static int loadvm_postcopy_ram_handle_end(MigrationIncomingState *mis) +/* The end - with a byte from the source which can tell us to fail. + * The source sends this either if there is a failure, or if it believes it's + * sent everything + */ +static int loadvm_postcopy_ram_handle_end(MigrationIncomingState *mis, + uint8_t status) { DPRINTF("%s", __func__); if (mis->postcopy_ram_state == POSTCOPY_RAM_INCOMING_NONE) { @@ -1375,7 +1403,37 @@ static int loadvm_postcopy_ram_handle_end(MigrationIncomingState *mis) mis->postcopy_ram_state); return -1; } - return -1; /* TODO - expecting 1 byte good/fail */ + + DPRINTF("loadvm_postcopy_ram_handle_end status=%d", status); + + if (!status) { + bool one_message = false; + /* This looks good, but it's possible that the device loading in the + * main thread hasn't finished yet, and so we might not be in 'RUN' + * state yet. + * TODO: Using an atomic_xchg or something for this + */ + while (mis->postcopy_ram_state == POSTCOPY_RAM_INCOMING_LISTENING) { + if (!one_message) { + DPRINTF("%s: Waiting for RUN", __func__); + one_message = true; + } + } + } + + /* TODO: Give up on non-0 status + * TODO: If 0 status, check we've received everything (all outstanding + * requests should already have been completed) + */ + + /* TODO: Or should this be none? */ + mis->postcopy_ram_state = POSTCOPY_RAM_INCOMING_END; + /* TODO: Wait for the UF thread, but we can't join here since it would + * block main thread; we should only have received this after every page + * anyway. + */ + migrate_send_rp_shut(mis, status); + return LOADVM_EXITCODE_QUITLOOP; } static int loadvm_process_command_simple_lencheck(const char *name, @@ -1516,7 +1574,7 @@ static int loadvm_process_command(QEMUFile *f, len, 1)) { return -1; } - return loadvm_postcopy_ram_handle_end(mis); + return loadvm_postcopy_ram_handle_end(mis, qemu_get_byte(f)); default: error_report("VM_COMMAND 0x%x unknown (len 0x%x)", com, len); -- 1.9.3