mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/hbitmap: update orig_size on truncate

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

Fixes: 76d570dc495c56bb
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190805120120.23585-1-vsementsov@virtuozzo.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2019-08-05 15:01:20 +03:00 committed by Max Reitz
parent 5f594a2e99
commit 4e4de22279
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/hbitmap.c
View File

@ -53,7 +53,9 @@
*/ */
struct HBitmap { 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; uint64_t orig_size;
/* Number of total bits in the bottom level. */ /* 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 num_elements = size;
uint64_t old; uint64_t old;
hb->orig_size = size;
/* Size comes in as logical elements, adjust for granularity. */ /* Size comes in as logical elements, adjust for granularity. */
size = (size + (1ULL << hb->granularity) - 1) >> hb->granularity; size = (size + (1ULL << hb->granularity) - 1) >> hb->granularity;
assert(size <= ((uint64_t)1 << HBITMAP_LOG_MAX_SIZE)); assert(size <= ((uint64_t)1 << HBITMAP_LOG_MAX_SIZE));