| Message ID | 1416944800-17919-4-git-send-email-jsnow@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 2014-11-25 at 20:46, John Snow wrote: > From: Fam Zheng <famz@redhat.com> > > This returns the granularity (in bytes) of dirty bitmap, > which matches the QMP interface and the existing query > interface. > > Signed-off-by: Fam Zheng <famz@redhat.com> > Reviewed-by: Benoit Canet <benoit@irqsave.net> Maybe you should have removed the R-b because of the functional changes, but Benoît should complain about that, not me. > Signed-off-by: John Snow <jsnow@redhat.com> > --- > block.c | 9 +++++++-- > include/block/block.h | 2 ++ > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/block.c b/block.c > index a940345..ea4c8d8 100644 > --- a/block.c > +++ b/block.c > @@ -5364,8 +5364,7 @@ BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs) > BlockDirtyInfo *info = g_new0(BlockDirtyInfo, 1); > BlockDirtyInfoList *entry = g_new0(BlockDirtyInfoList, 1); > info->count = bdrv_get_dirty_count(bs, bm); > - info->granularity = > - ((int64_t) BDRV_SECTOR_SIZE << hbitmap_granularity(bm->bitmap)); > + info->granularity = bdrv_dirty_bitmap_granularity(bs, bm); > info->has_name = !!bm->name; > info->name = g_strdup(bm->name); > entry->value = info; > @@ -5404,6 +5403,12 @@ int64_t bdrv_dbm_calc_def_granularity(BlockDriverState *bs) > return granularity; > } > > +int64_t bdrv_dirty_bitmap_granularity(BlockDriverState *bs, > + BdrvDirtyBitmap *bitmap) > +{ > + return BDRV_SECTOR_SIZE << hbitmap_granularity(bitmap->bitmap); > +} > + Oh, BDRV_SECTOR_SIZE is an unsigned long long. Great, I didn't know. (So this can't overflow) Reviewed-by: Max Reitz <mreitz@redhat.com>
diff --git a/block.c b/block.c index a940345..ea4c8d8 100644 --- a/block.c +++ b/block.c @@ -5364,8 +5364,7 @@ BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs) BlockDirtyInfo *info = g_new0(BlockDirtyInfo, 1); BlockDirtyInfoList *entry = g_new0(BlockDirtyInfoList, 1); info->count = bdrv_get_dirty_count(bs, bm); - info->granularity = - ((int64_t) BDRV_SECTOR_SIZE << hbitmap_granularity(bm->bitmap)); + info->granularity = bdrv_dirty_bitmap_granularity(bs, bm); info->has_name = !!bm->name; info->name = g_strdup(bm->name); entry->value = info; @@ -5404,6 +5403,12 @@ int64_t bdrv_dbm_calc_def_granularity(BlockDriverState *bs) return granularity; } +int64_t bdrv_dirty_bitmap_granularity(BlockDriverState *bs, + BdrvDirtyBitmap *bitmap) +{ + return BDRV_SECTOR_SIZE << hbitmap_granularity(bitmap->bitmap); +} + void bdrv_dirty_iter_init(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, HBitmapIter *hbi) { diff --git a/include/block/block.h b/include/block/block.h index feb84e2..9a62bce 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -438,6 +438,8 @@ void bdrv_dirty_bitmap_make_anon(BlockDriverState *bs, BdrvDirtyBitmap *bitmap); void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap); BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs); int64_t bdrv_dbm_calc_def_granularity(BlockDriverState *bs); +int64_t bdrv_dirty_bitmap_granularity(BlockDriverState *bs, + BdrvDirtyBitmap *bitmap); int bdrv_get_dirty(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, int64_t sector); void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors); void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors);