Commit b8e6fb75 authored by John Snow's avatar John Snow Committed by Kevin Wolf
Browse files

block: Add bitmap disabled status 



Add a status indicating the enabled/disabled state of the bitmap.
A bitmap is by default enabled, but you can lock the bitmap into
a read-only state by setting disabled = true.

A previous version of this patch added a QMP interface for changing
the state of the bitmap, but it has since been removed for now until
a use case emerges where this state must be revealed to the user.

The disabled state WILL be used internally for bitmap migration and
bitmap persistence.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 1429314609-29776-9-git-send-email-jsnow@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent be58721d

block.c

+25 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
struct BdrvDirtyBitmap {

    HBitmap *bitmap;

    char *name;

    bool disabled;

    QLIST_ENTRY(BdrvDirtyBitmap) list;

};
@@ -5547,10 +5548,16 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, 
    bitmap = g_new0(BdrvDirtyBitmap, 1);

    bitmap->bitmap = hbitmap_alloc(bitmap_size, ctz32(sector_granularity));

    bitmap->name = g_strdup(name);

    bitmap->disabled = false;

    QLIST_INSERT_HEAD(&bs->dirty_bitmaps, bitmap, list);

    return bitmap;

}



bool bdrv_dirty_bitmap_enabled(BdrvDirtyBitmap *bitmap)

{

    return !bitmap->disabled;

}



void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap)

{

    BdrvDirtyBitmap *bm, *next;
@@ -5565,6 +5572,16 @@ void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap) 
    }

}



void bdrv_disable_dirty_bitmap(BdrvDirtyBitmap *bitmap)

{

    bitmap->disabled = true;

}



void bdrv_enable_dirty_bitmap(BdrvDirtyBitmap *bitmap)

{

    bitmap->disabled = false;

}



BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs)

{

    BdrvDirtyBitmap *bm;
@@ -5629,12 +5646,14 @@ void bdrv_dirty_iter_init(BlockDriverState *bs, 
void bdrv_set_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap,

                           int64_t cur_sector, int nr_sectors)

{

    assert(bdrv_dirty_bitmap_enabled(bitmap));

    hbitmap_set(bitmap->bitmap, cur_sector, nr_sectors);

}



void bdrv_reset_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap,

                             int64_t cur_sector, int nr_sectors)

{

    assert(bdrv_dirty_bitmap_enabled(bitmap));

    hbitmap_reset(bitmap->bitmap, cur_sector, nr_sectors);

}
@@ -5643,6 +5662,9 @@ static void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, 
{

    BdrvDirtyBitmap *bitmap;

    QLIST_FOREACH(bitmap, &bs->dirty_bitmaps, list) {

        if (!bdrv_dirty_bitmap_enabled(bitmap)) {

            continue;

        }

        hbitmap_set(bitmap->bitmap, cur_sector, nr_sectors);

    }

}
@@ -5652,6 +5674,9 @@ static void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, 
{

    BdrvDirtyBitmap *bitmap;

    QLIST_FOREACH(bitmap, &bs->dirty_bitmaps, list) {

        if (!bdrv_dirty_bitmap_enabled(bitmap)) {

            continue;

        }

        hbitmap_reset(bitmap->bitmap, cur_sector, nr_sectors);

    }

}

include/block/block.h

+3 −0
Original line number Diff line number Diff line
@@ -458,9 +458,12 @@ BdrvDirtyBitmap *bdrv_find_dirty_bitmap(BlockDriverState *bs, 
                                        const char *name);

void bdrv_dirty_bitmap_make_anon(BlockDriverState *bs, BdrvDirtyBitmap *bitmap);

void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap);

void bdrv_disable_dirty_bitmap(BdrvDirtyBitmap *bitmap);

void bdrv_enable_dirty_bitmap(BdrvDirtyBitmap *bitmap);

BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs);

uint32_t bdrv_get_default_bitmap_granularity(BlockDriverState *bs);

uint32_t bdrv_dirty_bitmap_granularity(BdrvDirtyBitmap *bitmap);

bool bdrv_dirty_bitmap_enabled(BdrvDirtyBitmap *bitmap);

int bdrv_get_dirty(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, int64_t sector);

void bdrv_set_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap,

                           int64_t cur_sector, int nr_sectors);