Commit 85cc8a4f authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by John Snow
Browse files

block: move bdrv_can_store_new_dirty_bitmap to block/dirty-bitmap.c 



block/dirty-bitmap.c seems to be more appropriate for it and
bdrv_remove_persistent_dirty_bitmap already in it.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Message-id: 20190920082543.23444-2-vsementsov@virtuozzo.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 48557b13

block.c

+0 −22
Original line number Diff line number Diff line
@@ -6582,25 +6582,3 @@ void bdrv_del_child(BlockDriverState *parent_bs, BdrvChild *child, Error **errp) 


    parent_bs->drv->bdrv_del_child(parent_bs, child, errp);

}
 


bool bdrv_can_store_new_dirty_bitmap(BlockDriverState *bs, const char *name,

                                     uint32_t granularity, Error **errp)

{

    BlockDriver *drv = bs->drv;



    if (!drv) {

        error_setg_errno(errp, ENOMEDIUM,

                         "Can't store persistent bitmaps to %s",

                         bdrv_get_device_or_node_name(bs));

        return false;

    }



    if (!drv->bdrv_can_store_new_dirty_bitmap) {

        error_setg_errno(errp, ENOTSUP,

                         "Can't store persistent bitmaps to %s",

                         bdrv_get_device_or_node_name(bs));

        return false;

    }



    return drv->bdrv_can_store_new_dirty_bitmap(bs, name, granularity, errp);

}

block/dirty-bitmap.c

+22 −0
Original line number Diff line number Diff line
@@ -464,6 +464,28 @@ void bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs, 
    }

}



bool bdrv_can_store_new_dirty_bitmap(BlockDriverState *bs, const char *name,

                                     uint32_t granularity, Error **errp)

{

    BlockDriver *drv = bs->drv;



    if (!drv) {

        error_setg_errno(errp, ENOMEDIUM,

                         "Can't store persistent bitmaps to %s",

                         bdrv_get_device_or_node_name(bs));

        return false;

    }



    if (!drv->bdrv_can_store_new_dirty_bitmap) {

        error_setg_errno(errp, ENOTSUP,

                         "Can't store persistent bitmaps to %s",

                         bdrv_get_device_or_node_name(bs));

        return false;

    }



    return drv->bdrv_can_store_new_dirty_bitmap(bs, name, granularity, errp);

}



void bdrv_disable_dirty_bitmap(BdrvDirtyBitmap *bitmap)

{

    bdrv_dirty_bitmap_lock(bitmap);