aboutsummaryrefslogtreecommitdiff
path: root/migration/block.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/block.c
parentd1a8548c10bf6d24160ec2aafa4881a3f50a8373 (diff)
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/block.c')
-rw-r--r--migration/block.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/migration/block.c b/migration/block.c
index ecfe005691..cf9d9f8999 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -591,7 +591,7 @@ static int64_t get_remaining_dirty(void)
/* Called with iothread lock taken. */
-static void blk_mig_cleanup(void)
+static void block_migration_cleanup(void *opaque)
{
BlkMigDevState *bmds;
BlkMigBlock *blk;
@@ -618,11 +618,6 @@ static void blk_mig_cleanup(void)
blk_mig_unlock();
}
-static void block_migration_cancel(void *opaque)
-{
- blk_mig_cleanup();
-}
-
static int block_save_setup(QEMUFile *f, void *opaque)
{
int ret;
@@ -884,7 +879,7 @@ static SaveVMHandlers savevm_block_handlers = {
.save_live_complete = block_save_complete,
.save_live_pending = block_save_pending,
.load_state = block_load,
- .cleanup = block_migration_cancel,
+ .cleanup = block_migration_cleanup,
.is_active = block_is_active,
};