[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/35] ram: rename last_block to last_seen_block
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 24/35] ram: rename last_block to last_seen_block |
Date: |
Tue, 11 Dec 2012 13:47:00 +0100 |
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 4379108..73bcbcc 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 17/35] migration: move migration_fd_put_ready(), (continued)
- [Qemu-devel] [PATCH 17/35] migration: move migration_fd_put_ready(), Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 16/35] migration: move buffered_file.c code into migration.c, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 22/35] migration: move exit condition to migration thread, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 28/35] migration: Only go to the iterate stage if there is anything to send, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 20/35] migration: move begining stage to the migration thread, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 19/35] migration: move migration notifier, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 25/35] ram: Add last_sent_block, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 21/35] migration: Add buffered_flush error handling, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 27/35] ram: Use memory_region_test_and_clear_dirty, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 26/35] memory: introduce memory_region_test_and_clear_dirty, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 24/35] ram: rename last_block to last_seen_block,
Juan Quintela <=
- [Qemu-devel] [PATCH 35/35] migration: print times for end phase, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 32/35] ram: add free_space parameter to save_live functions, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 30/35] ram: account the amount of transferred ram better, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 29/35] ram: optimize migration bitmap walking, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 31/35] ram: refactor ram_save_block() return value, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 34/35] ram: reuse ram_save_iterate() for the complete stage, Juan Quintela, 2012/12/11
- Re: [Qemu-devel] [PATCH 00/35] Migration thread (20121211), Paolo Bonzini, 2012/12/11
- [Qemu-devel] [PATCH 33/35] ram: remove xbrle last_stage optimization, Juan Quintela, 2012/12/11