[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [v2 RESEND 4/4] migration: code clean up
From: |
Liang Li |
Subject: |
[Qemu-devel] [v2 RESEND 4/4] migration: code clean up |
Date: |
Mon, 2 Nov 2015 15:37:03 +0800 |
Just clean up code, no behavior change.
Signed-off-by: Liang Li <address@hidden>
---
migration/block.c | 9 ++-------
migration/ram.c | 9 ++-------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/migration/block.c b/migration/block.c
index ecfe005..cf9d9f8 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,
};
diff --git a/migration/ram.c b/migration/ram.c
index 0a51473..df3df9e 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)
--
1.9.1
- [Qemu-devel] [v2 RESEND 0/4] Fix long vm downtime during live migration, Liang Li, 2015/11/02
- [Qemu-devel] [v2 RESEND 1/4] migration: defer migration_end & blk_mig_cleanup, Liang Li, 2015/11/02
- [Qemu-devel] [v2 RESEND 2/4] migration: rename qemu_savevm_state_cancel, Liang Li, 2015/11/02
- [Qemu-devel] [v2 RESEND 4/4] migration: code clean up,
Liang Li <=
- [Qemu-devel] [v2 RESEND 3/4] migration: rename cancel to cleanup in SaveVMHandles, Liang Li, 2015/11/02
- Re: [Qemu-devel] [v2 RESEND 0/4] Fix long vm downtime during live migration, Paolo Bonzini, 2015/11/02
- Re: [Qemu-devel] [v2 RESEND 0/4] Fix long vm downtime during live migration, Stefan Hajnoczi, 2015/11/02
- Re: [Qemu-devel] [v2 RESEND 0/4] Fix long vm downtime during live migration, Amit Shah, 2015/11/03