Commit 6bdc8b71 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Max Reitz
Browse files

block/dirty-bitmap: add deserialize_ones func 



Add bdrv_dirty_bitmap_deserialize_ones() function, which is needed for
qcow2 bitmap loading, to handle unallocated bitmap parts, marked as
all-ones.

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

block/dirty-bitmap.c

+7 −0
Original line number Diff line number Diff line
@@ -586,6 +586,13 @@ void bdrv_dirty_bitmap_deserialize_zeroes(BdrvDirtyBitmap *bitmap, 
    hbitmap_deserialize_zeroes(bitmap->bitmap, start, count, finish);

}



void bdrv_dirty_bitmap_deserialize_ones(BdrvDirtyBitmap *bitmap,

                                        uint64_t start, uint64_t count,

                                        bool finish)

{

    hbitmap_deserialize_ones(bitmap->bitmap, start, count, finish);

}



void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap)

{

    hbitmap_deserialize_finish(bitmap->bitmap);

include/block/dirty-bitmap.h

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ void bdrv_dirty_bitmap_deserialize_part(BdrvDirtyBitmap *bitmap, 
void bdrv_dirty_bitmap_deserialize_zeroes(BdrvDirtyBitmap *bitmap,

                                          uint64_t start, uint64_t count,

                                          bool finish);

void bdrv_dirty_bitmap_deserialize_ones(BdrvDirtyBitmap *bitmap,

                                        uint64_t start, uint64_t count,

                                        bool finish);

void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap);



/* Functions that require manual locking.  */

include/qemu/hbitmap.h

+15 −0
Original line number Diff line number Diff line
@@ -228,6 +228,21 @@ void hbitmap_deserialize_part(HBitmap *hb, uint8_t *buf, 
void hbitmap_deserialize_zeroes(HBitmap *hb, uint64_t start, uint64_t count,

                                bool finish);



/**

 * hbitmap_deserialize_ones

 * @hb: HBitmap to operate on.

 * @start: First bit to restore.

 * @count: Number of bits to restore.

 * @finish: Whether to call hbitmap_deserialize_finish automatically.

 *

 * Fills the bitmap with ones.

 *

 * If @finish is false, caller must call hbitmap_serialize_finish before using

 * the bitmap.

 */

void hbitmap_deserialize_ones(HBitmap *hb, uint64_t start, uint64_t count,

                              bool finish);



/**

 * hbitmap_deserialize_finish

 * @hb: HBitmap to operate on.

util/hbitmap.c

+17 −0
Original line number Diff line number Diff line
@@ -551,6 +551,23 @@ void hbitmap_deserialize_zeroes(HBitmap *hb, uint64_t start, uint64_t count, 
    }

}



void hbitmap_deserialize_ones(HBitmap *hb, uint64_t start, uint64_t count,

                              bool finish)

{

    uint64_t el_count;

    unsigned long *first;



    if (!count) {

        return;

    }

    serialization_chunk(hb, start, count, &first, &el_count);



    memset(first, 0xff, el_count * sizeof(unsigned long));

    if (finish) {

        hbitmap_deserialize_finish(hb);

    }

}



void hbitmap_deserialize_finish(HBitmap *bitmap)

{

    int64_t i, size, prev_size;