Commit 56f364e6 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Max Reitz
Browse files

block/dirty-bitmap: add bdrv_remove_persistent_dirty_bitmap 



Interface for removing persistent bitmap from its storage.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Message-id: 20170628120530.31251-28-vsementsov@virtuozzo.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent fc905d3a

block/dirty-bitmap.c

+18 −0
Original line number Diff line number Diff line
@@ -395,6 +395,7 @@ void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap) 
/**

 * Release all named dirty bitmaps attached to a BDS (for use in bdrv_close()).

 * There must not be any frozen bitmaps attached.

 * This function does not remove persistent bitmaps from the storage.

 * Called with BQL taken.

 */

void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs)
@@ -402,6 +403,23 @@ void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs) 
    bdrv_do_release_matching_dirty_bitmap(bs, NULL, true);

}



/**

 * Remove persistent dirty bitmap from the storage if it exists.

 * Absence of bitmap is not an error, because we have the following scenario:

 * BdrvDirtyBitmap can have .persistent = true but not yet saved and have no

 * stored version. For such bitmap bdrv_remove_persistent_dirty_bitmap() should

 * not fail.

 * This function doesn't release corresponding BdrvDirtyBitmap.

 */

void bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs,

                                         const char *name,

                                         Error **errp)

{

    if (bs->drv && bs->drv->bdrv_remove_persistent_dirty_bitmap) {

        bs->drv->bdrv_remove_persistent_dirty_bitmap(bs, name, errp);

    }

}



/* Called with BQL taken.  */

void bdrv_disable_dirty_bitmap(BdrvDirtyBitmap *bitmap)

{

include/block/block_int.h

+3 −0
Original line number Diff line number Diff line
@@ -391,6 +391,9 @@ struct BlockDriver { 
                                            const char *name,

                                            uint32_t granularity,

                                            Error **errp);

    void (*bdrv_remove_persistent_dirty_bitmap)(BlockDriverState *bs,

                                                const char *name,

                                                Error **errp);



    QLIST_ENTRY(BlockDriver) list;

};

include/block/dirty-bitmap.h

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ BdrvDirtyBitmap *bdrv_find_dirty_bitmap(BlockDriverState *bs, 
void bdrv_dirty_bitmap_make_anon(BdrvDirtyBitmap *bitmap);

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

void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs);

void bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs,

                                         const char *name,

                                         Error **errp);

void bdrv_disable_dirty_bitmap(BdrvDirtyBitmap *bitmap);

void bdrv_enable_dirty_bitmap(BdrvDirtyBitmap *bitmap);

BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs);