Commit 362fdf17 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

migration/block: Clean up BBs in block_save_complete() 



We need to release any block migrations BlockBackends on the source
before successfully completing the migration because otherwise
inactivating the images will fail (inactivation only tolerates device
BBs).

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
parent f07fa4cb

migration/block.c

+17 −5
Original line number Diff line number Diff line
@@ -674,16 +674,14 @@ static int64_t get_remaining_dirty(void) 
    return dirty << BDRV_SECTOR_BITS;

}



/* Called with iothread lock taken.  */



static void block_migration_cleanup(void *opaque)



/* Called with iothread lock taken.  */

static void block_migration_cleanup_bmds(void)

{

    BlkMigDevState *bmds;

    BlkMigBlock *blk;

    AioContext *ctx;



    bdrv_drain_all();



    unset_dirty_tracking();



    while ((bmds = QSIMPLEQ_FIRST(&block_mig_state.bmds_list)) != NULL) {
@@ -701,6 +699,16 @@ static void block_migration_cleanup(void *opaque) 
        g_free(bmds->aio_bitmap);

        g_free(bmds);

    }

}



/* Called with iothread lock taken.  */

static void block_migration_cleanup(void *opaque)

{

    BlkMigBlock *blk;



    bdrv_drain_all();



    block_migration_cleanup_bmds();



    blk_mig_lock();

    while ((blk = QSIMPLEQ_FIRST(&block_mig_state.blk_list)) != NULL) {
@@ -844,6 +852,10 @@ static int block_save_complete(QEMUFile *f, void *opaque) 


    qemu_put_be64(f, BLK_MIG_FLAG_EOS);



    /* Make sure that our BlockBackends are gone, so that the block driver

     * nodes can be inactivated. */

    block_migration_cleanup_bmds();



    return 0;

}