Patchwork [34/35] ram: reuse ram_save_iterate() for the complete stage

login
register
mail settings
Submitter Juan Quintela
Date Dec. 11, 2012, 12:47 p.m.
Message ID <1355230031-28233-35-git-send-email-quintela@redhat.com>
Download mbox | patch
Permalink /patch/205229/
State New
Headers show

Comments

Juan Quintela - Dec. 11, 2012, 12:47 p.m.
This means that we only have one memory loop for the iterate and
complete phase.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 arch_init.c | 17 -----------------
 migration.c | 12 ++++++++++++
 2 files changed, 12 insertions(+), 17 deletions(-)

Patch

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();