From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOkZU-0005hK-Lh for qemu-devel@nongnu.org; Thu, 18 Oct 2012 03:31:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOkZT-0000hY-G6 for qemu-devel@nongnu.org; Thu, 18 Oct 2012 03:31:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOkZT-0000hP-6S 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 q9I7V9ot029454 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 18 Oct 2012 03:31:10 -0400 From: Juan Quintela Date: Thu, 18 Oct 2012 09:30:20 +0200 Message-Id: <1350545426-23172-25-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> Subject: [Qemu-devel] [PATCH 24/30] ram: rename last_block to last_seen_block List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Juan Quintela --- arch_init.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/arch_init.c b/arch_init.c index 1eefef8..8ac4c94 100644 --- a/arch_init.c +++ b/arch_init.c @@ -332,7 +332,10 @@ static int save_xbzrle_page(QEMUFile *f, uint8_t *current_data, return bytes_sent; } -static RAMBlock *last_block; + +/* This is the last block that we have visited serching for dirty pages + */ +static RAMBlock *last_seen_block; static ram_addr_t last_offset; static unsigned long *migration_bitmap; static uint64_t migration_dirty_pages; @@ -417,7 +420,7 @@ static void migration_bitmap_sync(void) static int ram_save_block(QEMUFile *f, bool last_stage) { - RAMBlock *block = last_block; + RAMBlock *block = last_seen_block; ram_addr_t offset = last_offset; int bytes_sent = -1; MemoryRegion *mr; @@ -430,7 +433,8 @@ 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_block) ? RAM_SAVE_FLAG_CONTINUE : 0; + int cont = (block == last_seen_block) ? + RAM_SAVE_FLAG_CONTINUE : 0; p = memory_region_get_ram_ptr(mr) + offset; @@ -469,9 +473,9 @@ static int ram_save_block(QEMUFile *f, bool last_stage) if (!block) block = QLIST_FIRST(&ram_list.blocks); } - } while (block != last_block || offset != last_offset); + } while (block != last_seen_block || offset != last_offset); - last_block = block; + last_seen_block = block; last_offset = offset; return bytes_sent; @@ -555,7 +559,7 @@ static void ram_migration_cancel(void *opaque) static void reset_ram_globals(void) { - last_block = NULL; + last_seen_block = NULL; last_offset = 0; last_version = ram_list.version; sort_ram_list(); -- 1.7.11.7