From 6d59fec11eeff8a784dc4991c8fe4f8538510475 Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Mon, 8 Nov 2010 17:02:54 -0200 Subject: block: fix shift in dirty bitmap calculation Otherwise upper 32 bits of bitmap entries are not correctly calculated. Reviewed-by: Kevin Wolf Signed-off-by: Marcelo Tosatti Signed-off-by: Anthony Liguori --- block.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'block.c') diff --git a/block.c b/block.c index 6b505fba1b..53a10de9dc 100644 --- a/block.c +++ b/block.c @@ -930,14 +930,14 @@ static void set_dirty_bitmap(BlockDriverState *bs, int64_t sector_num, bit = start % (sizeof(unsigned long) * 8); val = bs->dirty_bitmap[idx]; if (dirty) { - if (!(val & (1 << bit))) { + if (!(val & (1UL << bit))) { bs->dirty_count++; - val |= 1 << bit; + val |= 1UL << bit; } } else { - if (val & (1 << bit)) { + if (val & (1UL << bit)) { bs->dirty_count--; - val &= ~(1 << bit); + val &= ~(1UL << bit); } } bs->dirty_bitmap[idx] = val; @@ -2685,8 +2685,8 @@ int bdrv_get_dirty(BlockDriverState *bs, int64_t sector) if (bs->dirty_bitmap && (sector << BDRV_SECTOR_BITS) < bdrv_getlength(bs)) { - return bs->dirty_bitmap[chunk / (sizeof(unsigned long) * 8)] & - (1 << (chunk % (sizeof(unsigned long) * 8))); + return !!(bs->dirty_bitmap[chunk / (sizeof(unsigned long) * 8)] & + (1UL << (chunk % (sizeof(unsigned long) * 8)))); } else { return 0; } -- cgit v1.2.3