From b23a9a5cad356cdc8e25d4be72e53096a27ea722 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 17 Oct 2012 20:08:04 +0200 Subject: ram: rename last_block to last_seen_block Signed-off-by: Juan Quintela --- arch_init.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'arch_init.c') diff --git a/arch_init.c b/arch_init.c index af1ae9f72a..4351d304a8 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 = QTAILQ_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; @@ -530,7 +534,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; } -- cgit v1.2.3-55-g7522