From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xa6zX-0002Rf-6C for qemu-devel@nongnu.org; Fri, 03 Oct 2014 13:50:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xa6zP-0001ix-NC for qemu-devel@nongnu.org; Fri, 03 Oct 2014 13:50:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4095) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xa6zP-0001ir-Ex for qemu-devel@nongnu.org; Fri, 03 Oct 2014 13:49:59 -0400 From: "Dr. David Alan Gilbert (git)" Date: Fri, 3 Oct 2014 18:47:53 +0100 Message-Id: <1412358473-31398-48-git-send-email-dgilbert@redhat.com> In-Reply-To: <1412358473-31398-1-git-send-email-dgilbert@redhat.com> References: <1412358473-31398-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v4 47/47] End of migration for postcopy 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, cristian.klein@cs.umu.se, amit.shah@redhat.com, yanghy@cn.fujitsu.com From: "Dr. David Alan Gilbert" 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 --- migration.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/migration.c b/migration.c index f0f2e2f..1ee5b1b 100644 --- a/migration.c +++ b/migration.c @@ -205,12 +205,33 @@ static void process_incoming_migration_co(void *opaque) { QEMUFile *f = opaque; Error *local_err = NULL; + MigrationIncomingState *mis; int ret; - migration_incoming_state_init(f); + mis = migration_incoming_state_init(f); ret = qemu_loadvm_state(f); + DPRINTF("%s: ret=%d postcopy_ram_state=%d", __func__, ret, + mis->postcopy_ram_state); + if (mis->postcopy_ram_state == POSTCOPY_RAM_INCOMING_ADVISE) { + /* + * Where a migration had postcopy enabled (and thus went to advise) + * but managed to complete within the precopy period + */ + postcopy_ram_incoming_cleanup(mis); + } else { + if ((ret >= 0) && + (mis->postcopy_ram_state > POSTCOPY_RAM_INCOMING_ADVISE)) { + /* + * Postcopy was started, cleanup should happen at the end of the + * postcopy thread. + */ + DPRINTF("process_incoming_migration_co: exiting main branch"); + return; + } + } + qemu_fclose(f); free_xbzrle_decoded_buf(); migration_incoming_state_destroy(); -- 1.9.3