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

block/dirty-bitmap: refactor bdrv_dirty_bitmap_next 



bdrv_dirty_bitmap_next is always used in same pattern. So, split it
into _next and _first, instead of combining two functions into one and
add FOR_EACH_DIRTY_BITMAP macro.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Message-id: 20190916141911.5255-5-vsementsov@virtuozzo.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 1e638301

block.c

+1 −3
Original line number Diff line number Diff line
@@ -5390,9 +5390,7 @@ static void coroutine_fn bdrv_co_invalidate_cache(BlockDriverState *bs, 
        }

    }



    for (bm = bdrv_dirty_bitmap_next(bs, NULL); bm;

         bm = bdrv_dirty_bitmap_next(bs, bm))

    {

    FOR_EACH_DIRTY_BITMAP(bs, bm) {

        bdrv_dirty_bitmap_skip_store(bm, false);

    }

block/dirty-bitmap.c

+7 −4
Original line number Diff line number Diff line
@@ -851,11 +851,14 @@ bool bdrv_has_changed_persistent_bitmaps(BlockDriverState *bs) 
    return false;

}



BdrvDirtyBitmap *bdrv_dirty_bitmap_next(BlockDriverState *bs,

                                        BdrvDirtyBitmap *bitmap)

BdrvDirtyBitmap *bdrv_dirty_bitmap_first(BlockDriverState *bs)

{

    return bitmap == NULL ? QLIST_FIRST(&bs->dirty_bitmaps) :

                            QLIST_NEXT(bitmap, list);

    return QLIST_FIRST(&bs->dirty_bitmaps);

}



BdrvDirtyBitmap *bdrv_dirty_bitmap_next(BdrvDirtyBitmap *bitmap)

{

    return QLIST_NEXT(bitmap, list);

}



char *bdrv_dirty_bitmap_sha256(const BdrvDirtyBitmap *bitmap, Error **errp)

block/qcow2-bitmap.c

+2 −6
Original line number Diff line number Diff line
@@ -1488,9 +1488,7 @@ void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **errp) 
    }



    /* check constraints and names */

    for (bitmap = bdrv_dirty_bitmap_next(bs, NULL); bitmap != NULL;

         bitmap = bdrv_dirty_bitmap_next(bs, bitmap))

    {

    FOR_EACH_DIRTY_BITMAP(bs, bitmap) {

        const char *name = bdrv_dirty_bitmap_name(bitmap);

        uint32_t granularity = bdrv_dirty_bitmap_granularity(bitmap);

        Qcow2Bitmap *bm;
@@ -1610,9 +1608,7 @@ int qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp) 
        return -EINVAL;

    }



    for (bitmap = bdrv_dirty_bitmap_next(bs, NULL); bitmap != NULL;

         bitmap = bdrv_dirty_bitmap_next(bs, bitmap))

    {

    FOR_EACH_DIRTY_BITMAP(bs, bitmap) {

        if (bdrv_dirty_bitmap_get_persistence(bitmap)) {

            bdrv_dirty_bitmap_set_readonly(bitmap, true);

        }

include/block/dirty-bitmap.h

+7 −2
Original line number Diff line number Diff line
@@ -96,8 +96,13 @@ bool bdrv_dirty_bitmap_get_autoload(const BdrvDirtyBitmap *bitmap); 
bool bdrv_dirty_bitmap_get_persistence(BdrvDirtyBitmap *bitmap);

bool bdrv_dirty_bitmap_inconsistent(const BdrvDirtyBitmap *bitmap);

bool bdrv_has_changed_persistent_bitmaps(BlockDriverState *bs);

BdrvDirtyBitmap *bdrv_dirty_bitmap_next(BlockDriverState *bs,

                                        BdrvDirtyBitmap *bitmap);



BdrvDirtyBitmap *bdrv_dirty_bitmap_first(BlockDriverState *bs);

BdrvDirtyBitmap *bdrv_dirty_bitmap_next(BdrvDirtyBitmap *bitmap);

#define FOR_EACH_DIRTY_BITMAP(bs, bitmap) \

for (bitmap = bdrv_dirty_bitmap_first(bs); bitmap; \

     bitmap = bdrv_dirty_bitmap_next(bitmap))



char *bdrv_dirty_bitmap_sha256(const BdrvDirtyBitmap *bitmap, Error **errp);

int64_t bdrv_dirty_bitmap_next_zero(BdrvDirtyBitmap *bitmap, uint64_t offset,

                                    uint64_t bytes);

migration/block-dirty-bitmap.c

+1 −3
Original line number Diff line number Diff line
@@ -283,9 +283,7 @@ static int init_dirty_bitmap_migration(void) 
    for (bs = bdrv_next_all_states(NULL); bs; bs = bdrv_next_all_states(bs)) {

        const char *name = bdrv_get_device_or_node_name(bs);



        for (bitmap = bdrv_dirty_bitmap_next(bs, NULL); bitmap;

             bitmap = bdrv_dirty_bitmap_next(bs, bitmap))

        {

        FOR_EACH_DIRTY_BITMAP(bs, bitmap) {

            if (!bdrv_dirty_bitmap_name(bitmap)) {

                continue;

            }