From patchwork Thu Oct 18 07:30:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 192226 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 F3AFC2C00A5 for ; Thu, 18 Oct 2012 19:05:35 +1100 (EST) Received: from localhost ([::1]:58985 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOl6k-0000bg-2g for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2012 04:05:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOkZa-0005zM-Rr for qemu-devel@nongnu.org; Thu, 18 Oct 2012 03:31:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOkZT-0000ho-QR for qemu-devel@nongnu.org; Thu, 18 Oct 2012 03:31:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60473) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOkZT-0000hS-IY for qemu-devel@nongnu.org; Thu, 18 Oct 2012 03:31:11 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9I7VAQZ021908 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 18 Oct 2012 03:31:10 -0400 Received: from trasno.mitica (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q9I7URni020816; Thu, 18 Oct 2012 03:31:09 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2012 09:30:21 +0200 Message-Id: <1350545426-23172-26-git-send-email-quintela@redhat.com> In-Reply-To: <1350545426-23172-1-git-send-email-quintela@redhat.com> References: <1350545426-23172-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Orit Wasserman Subject: [Qemu-devel] [PATCH 25/30] ram: Add last_sent_block 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 This is the last block from where we have sent data. Signed-off-by: Orit Wasserman Signed-off-by: Juan Quintela --- arch_init.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch_init.c b/arch_init.c index 8ac4c94..6f39ebd 100644 --- a/arch_init.c +++ b/arch_init.c @@ -336,6 +336,8 @@ static int save_xbzrle_page(QEMUFile *f, uint8_t *current_data, /* This is the last block that we have visited serching for dirty pages */ static RAMBlock *last_seen_block; +/* This is the last block from where we have sent data */ +static RAMBlock *last_sent_block; static ram_addr_t last_offset; static unsigned long *migration_bitmap; static uint64_t migration_dirty_pages; @@ -433,7 +435,7 @@ static int ram_save_block(QEMUFile *f, bool last_stage) mr = block->mr; if (migration_bitmap_test_and_reset_dirty(mr, offset)) { uint8_t *p; - int cont = (block == last_seen_block) ? + int cont = (block == last_sent_block) ? RAM_SAVE_FLAG_CONTINUE : 0; p = memory_region_get_ram_ptr(mr) + offset; @@ -462,6 +464,7 @@ static int ram_save_block(QEMUFile *f, bool last_stage) /* if page is unmodified, continue to the next */ if (bytes_sent != 0) { + last_sent_block = block; break; } } @@ -560,6 +563,7 @@ static void ram_migration_cancel(void *opaque) static void reset_ram_globals(void) { last_seen_block = NULL; + last_sent_block = NULL; last_offset = 0; last_version = ram_list.version; sort_ram_list();