From patchwork Tue Mar 26 09:58:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 231138 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 124212C0084 for ; Tue, 26 Mar 2013 21:03:43 +1100 (EST) Received: from localhost ([::1]:34478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKQjF-0008C7-6G for incoming@patchwork.ozlabs.org; Tue, 26 Mar 2013 06:03:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKQh1-0005Dy-Lf for qemu-devel@nongnu.org; Tue, 26 Mar 2013 06:01:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKQgr-0006Q4-HN for qemu-devel@nongnu.org; Tue, 26 Mar 2013 06:01:23 -0400 Received: from [2a02:248:0:30:223:aeff:fefe:7f1c] (port=49002 helo=dns.kamp-intra.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKQgr-0006Pj-Bo for qemu-devel@nongnu.org; Tue, 26 Mar 2013 06:01:13 -0400 Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id BA486206B2; Tue, 26 Mar 2013 11:01:10 +0100 (CET) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id ABA495FBAA; Tue, 26 Mar 2013 11:01:12 +0100 (CET) From: Peter Lieven To: qemu-devel@nongnu.org Date: Tue, 26 Mar 2013 10:58:36 +0100 Message-Id: <1364291919-19563-8-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1364291919-19563-1-git-send-email-pl@kamp.de> References: <1364291919-19563-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2a02:248:0:30:223:aeff:fefe:7f1c Cc: quintela@redhat.com, Stefan Hajnoczi , Peter Lieven , Orit Wasserman , Paolo Bonzini Subject: [Qemu-devel] [PATCHv5 07/10] migration: add an indicator for bulk state of ram migration 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 the first round of ram transfer is special since all pages are dirty and thus all memory pages are transferred to the target. this patch adds a boolean variable to track this stage. Signed-off-by: Peter Lieven Reviewed-by: Eric Blake Reviewed-by: Orit Wasserman --- arch_init.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch_init.c b/arch_init.c index dd5deff..1291bd2 100644 --- a/arch_init.c +++ b/arch_init.c @@ -319,6 +319,7 @@ static ram_addr_t last_offset; static unsigned long *migration_bitmap; static uint64_t migration_dirty_pages; static uint32_t last_version; +static bool ram_bulk_stage; static inline ram_addr_t migration_bitmap_find_and_reset_dirty(MemoryRegion *mr, @@ -426,6 +427,7 @@ static int ram_save_block(QEMUFile *f, bool last_stage) if (!block) { block = QTAILQ_FIRST(&ram_list.blocks); complete_round = true; + ram_bulk_stage = false; } } else { uint8_t *p; @@ -529,6 +531,7 @@ static void reset_ram_globals(void) last_sent_block = NULL; last_offset = 0; last_version = ram_list.version; + ram_bulk_stage = true; } #define MAX_WAIT 50 /* ms, half buffered_file limit */