Commit 6ad2a215 authored by Liang Li's avatar Liang Li Committed by Juan Quintela
Browse files

migration: code clean up 



Just clean up code, no behavior change.

Signed-off-by: default avatarLiang Li <liang.z.li@intel.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com&gt;al3>
Reviewed-by: default avatarAmit Shah <amit.shah@redhat.com&gt;al3>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com&gt;al3>
parent d1a8548c

migration/block.c

+2 −7
Original line number Diff line number Diff line
@@ -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,

};

migration/ram.c

+2 −7
Original line number Diff line number Diff line
@@ -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)