From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnPfp-0007WC-UO for qemu-devel@nongnu.org; Mon, 02 Dec 2013 04:20:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VnPfh-0002ih-06 for qemu-devel@nongnu.org; Mon, 02 Dec 2013 04:20:13 -0500 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:48804) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnPfg-0002aE-A6 for qemu-devel@nongnu.org; Mon, 02 Dec 2013 04:20:04 -0500 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 2 Dec 2013 14:50:02 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 5125A1258054 for ; Mon, 2 Dec 2013 14:51:02 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rB29JuVx57868454 for ; Mon, 2 Dec 2013 14:49:56 +0530 Received: from d28av01.in.ibm.com (localhost [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rB29JxqC002984 for ; Mon, 2 Dec 2013 14:49:59 +0530 From: Lei Li Date: Mon, 2 Dec 2013 17:19:15 +0800 Message-Id: <1385975957-22941-16-git-send-email-lilei@linux.vnet.ibm.com> In-Reply-To: <1385975957-22941-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1385975957-22941-1-git-send-email-lilei@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 15/17] migration-unix: page flipping support on unix outgoing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aarcange@redhat.com, Lei Li , quintela@redhat.com, mrhines@linux.vnet.ibm.com, aliguori@amazon.com, lagarcia@br.ibm.com, pbonzini@redhat.com, rcj@linux.vnet.ibm.com Add page flipping support on unix outgoing part by stopping VM with the new RunState RUN_STATE_MEMORY_STALE before invoking migration if unix_page_flipping enabled. Signed-off-by: Lei Li --- migration-unix.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/migration-unix.c b/migration-unix.c index 9beeafe..cbf2087 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -19,6 +19,7 @@ #include "migration/migration.h" #include "migration/qemu-file.h" #include "block/block.h" +#include "sysemu/sysemu.h" //#define DEBUG_MIGRATION_UNIX @@ -33,6 +34,7 @@ static void unix_wait_for_connect(int fd, void *opaque) { MigrationState *s = opaque; + int ret; if (fd < 0) { DPRINTF("migrate connect error\n"); @@ -47,6 +49,15 @@ static void unix_wait_for_connect(int fd, void *opaque) goto fail; } + /* Stop VM before invoking migration if unix_page_flipping enabled */ + if (migrate_unix_page_flipping()) { + ret = vm_stop_force_state(RUN_STATE_MEMORY_STALE); + if (ret < 0) { + DPRINTF("failed to stop VM\n"); + goto fail; + } + } + migrate_fd_connect(s); return; } -- 1.7.7.6