From patchwork Fri Nov 29 10:06:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lei Li X-Patchwork-Id: 295212 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5D8AF2C0097 for ; Fri, 29 Nov 2013 21:16:23 +1100 (EST) Received: from localhost ([::1]:46498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmL7U-0003R0-Qt for incoming@patchwork.ozlabs.org; Fri, 29 Nov 2013 05:16:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50217) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmKyu-0008Sk-3O for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:07:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmKyk-00083g-JW for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:07:27 -0500 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:53514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmKyj-00082C-Qq for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:07:18 -0500 Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 29 Nov 2013 20:07:15 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp04.au.ibm.com (202.81.31.210) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 29 Nov 2013 20:07:13 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id F17782CE8052 for ; Fri, 29 Nov 2013 21:07:12 +1100 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rAT9n5Ie60096546 for ; Fri, 29 Nov 2013 20:49:05 +1100 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rATA7Br4012851 for ; Fri, 29 Nov 2013 21:07:12 +1100 Received: from localhost.cn.ibm.com ([9.115.122.11]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id rATA6P1B011813; Fri, 29 Nov 2013 21:07:09 +1100 From: Lei Li To: qemu-devel@nongnu.org Date: Fri, 29 Nov 2013 18:06:22 +0800 Message-Id: <1385719584-21114-16-git-send-email-lilei@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1385719584-21114-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1385719584-21114-1-git-send-email-lilei@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13112910-9264-0000-0000-00000505CD7B X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.146 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 Subject: [Qemu-devel] [PATCH 15/17] migration-unix: page flipping support on unix outgoing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; }