[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/30] ram: rename last_block to last_seen_block
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 24/30] ram: rename last_block to last_seen_block |
Date: |
Thu, 18 Oct 2012 09:30:20 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
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
- [Qemu-devel] [PATCH 12/30] buffered_file: unfold buffered_append in buffered_put_buffer, (continued)
- [Qemu-devel] [PATCH 12/30] buffered_file: unfold buffered_append in buffered_put_buffer, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 18/30] migration: Inline qemu_fopen_ops_buffered into migrate_fd_connect, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 05/30] migration: make qemu_fopen_ops_buffered() return void, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 17/30] migration: move migration_fd_put_ready(), Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 19/30] migration: move migration notifier, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 15/30] migration-fd: remove duplicate include, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 23/30] migration: print times for end phase, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 16/30] migration: move buffered_file.c code into migration.c, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 24/30] ram: rename last_block to last_seen_block,
Juan Quintela <=
- [Qemu-devel] [PATCH 22/30] migration: unfold rest of migrate_fd_put_ready() into thread, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 21/30] migration: move exit condition to migration thread, Juan Quintela, 2012/10/18
[Qemu-devel] [PATCH 20/30] migration: move begining stage to the migration thread, Juan Quintela, 2012/10/18
[Qemu-devel] [PATCH 29/30] migration: Only go to the iterate stage if there is anything to send, Juan Quintela, 2012/10/18
[Qemu-devel] [PATCH 27/30] ram: Use memory_region_test_and_clear_dirty, Juan Quintela, 2012/10/18