[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 25/35] ram: Add last_sent_block
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 25/35] ram: Add last_sent_block |
Date: |
Tue, 11 Dec 2012 13:47:01 +0100 |
This is the last block from where we have sent data.
Signed-off-by: Orit Wasserman <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
arch_init.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch_init.c b/arch_init.c
index 73bcbcc..2d566d6 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();
--
1.7.11.7
- [Qemu-devel] [PATCH 15/35] migration-fd: remove duplicate include, (continued)
- [Qemu-devel] [PATCH 15/35] migration-fd: remove duplicate include, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 10/35] buffered_file: Unfold the trick to restart generating migration data, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 18/35] migration: Inline qemu_fopen_ops_buffered into migrate_fd_connect, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 23/35] migration: unfold rest of migrate_fd_put_ready() into thread, Juan Quintela, 2012/12/11
- [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 <=
- [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, 2012/12/11
- [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