Patchwork [08/41] savevm: Factorize ram globals reset in its own function

login
register
mail settings
Submitter Juan Quintela
Date Oct. 2, 2012, 11:33 a.m.
Message ID <1349177616-5341-9-git-send-email-quintela@redhat.com>
Download mbox | patch
Permalink /patch/188494/
State New
Headers show

Comments

Juan Quintela - Oct. 2, 2012, 11:33 a.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
---
 arch_init.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Patch

diff --git a/arch_init.c b/arch_init.c
index 3fddb38..6b9f949 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -481,6 +481,14 @@  static void ram_migration_cancel(void *opaque)
     migration_end();
 }

+
+static void reset_ram_globals(void)
+{
+    last_block = NULL;
+    last_offset = 0;
+    sort_ram_list();
+}
+
 #define MAX_WAIT 50 /* ms, half buffered_file limit */

 static int ram_save_setup(QEMUFile *f, void *opaque)
@@ -489,9 +497,7 @@  static int ram_save_setup(QEMUFile *f, void *opaque)
     RAMBlock *block;

     bytes_transferred = 0;
-    last_block = NULL;
-    last_offset = 0;
-    sort_ram_list();
+    reset_ram_globals();

     if (migrate_use_xbzrle()) {
         XBZRLE.cache = cache_init(migrate_xbzrle_cache_size() /