This means that we only have one memory loop for the iterate and
complete phase.
Signed-off-by: Juan Quintela <quint...@redhat.com>
---
arch_init.c | 17 -----------------
migration.c | 12 ++++++++++++
2 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 6a4ee24..87aecf8 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -675,25 +675,8 @@ static int ram_save_iterate(QEMUFile *f, void *opaque,
uint64_t free_space)
static int ram_save_complete(QEMUFile *f, void *opaque)
{
- migration_bitmap_sync();
-
qemu_mutex_lock_ramlist();
-
- /* try transferring iterative blocks of memory */
-
- /* flush all remaining blocks regardless of rate limiting */
- while (true) {
- int bytes_sent;
-
- bytes_sent = ram_save_block(f);
- /* no more blocks to sent */
- if (bytes_sent == 0) {
- break;
- }
- bytes_transferred += bytes_sent;
- }
memory_global_dirty_log_stop();
-
qemu_mutex_unlock_ramlist();
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
diff --git a/migration.c b/migration.c
index d59f7b4..dd6a401 100644
--- a/migration.c
+++ b/migration.c
@@ -728,6 +728,18 @@ static void *buffered_file_thread(void *opaque)
} else {
vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
}
+
+ /* 8 is the size of an end of section mark, so empty section */
+ while ((ret = qemu_savevm_state_iterate(m->file, free_space))
+ > 8) {
+ ret = buffered_flush(s);
+ if (ret < 0) {
+ qemu_mutex_unlock_iothread();
+ break;
+ }
+ free_space = s->buffer_capacity - s->buffer_size;
+ }
+
ret = qemu_savevm_state_complete(m->file);
if (ret < 0) {
qemu_mutex_unlock_iothread();
--
1.7.11.7
