summary refs log tree commit diff stats
path: root/migration/ram.c
diff options
context:
space:
mode:
authorLiang Li <liang.z.li@intel.com>2015-11-02 15:37:03 +0800
committerJuan Quintela <quintela@redhat.com>2015-11-04 13:40:13 +0100
commit6ad2a215e7170350430adfda02eb8ef47c1acd8e (patch)
tree0bd968ef716b135e865816ce62d0395d5e14a549 /migration/ram.c
parentd1a8548c10bf6d24160ec2aafa4881a3f50a8373 (diff)
downloadfocaccia-qemu-6ad2a215e7170350430adfda02eb8ef47c1acd8e.tar.gz
focaccia-qemu-6ad2a215e7170350430adfda02eb8ef47c1acd8e.zip
migration: code clean up
Just clean up code, no behavior change.

Signed-off-by: Liang Li <liang.z.li@intel.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>al3
Reviewed-by: Amit Shah <amit.shah@redhat.com>al3
Signed-off-by: Juan Quintela <quintela@redhat.com>al3
Diffstat (limited to 'migration/ram.c')
-rw-r--r--migration/ram.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/migration/ram.c b/migration/ram.c
index 0a51473cd6..df3df9e3bf 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1100,7 +1100,7 @@ static void migration_bitmap_free(struct BitmapRcu *bmap)
     g_free(bmap);
 }
 
-static void migration_end(void)
+static void ram_migration_cleanup(void *opaque)
 {
     /* caller have hold iothread lock or is in a bh, so there is
      * no writing race against this migration_bitmap
@@ -1124,11 +1124,6 @@ static void migration_end(void)
     XBZRLE_cache_unlock();
 }
 
-static void ram_migration_cancel(void *opaque)
-{
-    migration_end();
-}
-
 static void reset_ram_globals(void)
 {
     last_seen_block = NULL;
@@ -1685,7 +1680,7 @@ static SaveVMHandlers savevm_ram_handlers = {
     .save_live_complete = ram_save_complete,
     .save_live_pending = ram_save_pending,
     .load_state = ram_load,
-    .cleanup = ram_migration_cancel,
+    .cleanup = ram_migration_cleanup,
 };
 
 void ram_mig_init(void)