Commit 92bcea40 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by John Snow
Browse files

block/dirty-bitmap: add bdrv_enable_dirty_bitmap_locked 



Add _locked version of bdrv_enable_dirty_bitmap, to fix dirty bitmap
migration in the following patch.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20180625165745.25259-2-vsementsov@virtuozzo.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 79c2b203

block/dirty-bitmap.c

+7 −2
Original line number Diff line number Diff line
@@ -241,6 +241,12 @@ int bdrv_dirty_bitmap_create_successor(BlockDriverState *bs, 
    return 0;

}



void bdrv_enable_dirty_bitmap_locked(BdrvDirtyBitmap *bitmap)

{

    assert(!bdrv_dirty_bitmap_frozen(bitmap));

    bitmap->disabled = false;

}



/* Called with BQL taken. */

void bdrv_dirty_bitmap_enable_successor(BdrvDirtyBitmap *bitmap)

{
@@ -424,8 +430,7 @@ void bdrv_disable_dirty_bitmap(BdrvDirtyBitmap *bitmap) 
void bdrv_enable_dirty_bitmap(BdrvDirtyBitmap *bitmap)

{

    bdrv_dirty_bitmap_lock(bitmap);

    assert(!bdrv_dirty_bitmap_frozen(bitmap));

    bitmap->disabled = false;

    bdrv_enable_dirty_bitmap_locked(bitmap);

    bdrv_dirty_bitmap_unlock(bitmap);

}

include/block/dirty-bitmap.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ void bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs, 
                                         Error **errp);

void bdrv_disable_dirty_bitmap(BdrvDirtyBitmap *bitmap);

void bdrv_enable_dirty_bitmap(BdrvDirtyBitmap *bitmap);

void bdrv_enable_dirty_bitmap_locked(BdrvDirtyBitmap *bitmap);

BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs);

uint32_t bdrv_get_default_bitmap_granularity(BlockDriverState *bs);

uint32_t bdrv_dirty_bitmap_granularity(const BdrvDirtyBitmap *bitmap);