Commit 4e4de222 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Max Reitz
Browse files

util/hbitmap: update orig_size on truncate 



Without this, hbitmap_next_zero and hbitmap_next_dirty_area are broken
after truncate. So, orig_size is broken since it's introduction in
76d570dc.

Fixes: 76d570dc
Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190805120120.23585-1-vsementsov@virtuozzo.com
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 5f594a2e

util/hbitmap.c

+5 −1
Original line number Diff line number Diff line
@@ -53,7 +53,9 @@ 
 */



struct HBitmap {

    /* Size of the bitmap, as requested in hbitmap_alloc. */

    /*

     * Size of the bitmap, as requested in hbitmap_alloc or in hbitmap_truncate.

     */

    uint64_t orig_size;



    /* Number of total bits in the bottom level.  */
@@ -732,6 +734,8 @@ void hbitmap_truncate(HBitmap *hb, uint64_t size) 
    uint64_t num_elements = size;

    uint64_t old;



    hb->orig_size = size;



    /* Size comes in as logical elements, adjust for granularity. */

    size = (size + (1ULL << hb->granularity) - 1) >> hb->granularity;

    assert(size <= ((uint64_t)1 << HBITMAP_LOG_MAX_SIZE));