Sorry to be a nag, please always copy both qemu-block AND qemu-devel, otherwise some of the maintainer tools we use will miss it.
On 07/07/2016 05:35 AM, Denis V. Lunev wrote: > Underlying HBitmap operates even with uint64_t. Thus this change is safe. > This would be useful f.e. to mark entire bitmap dirty in one call. > > Signed-off-by: Denis V. Lunev <[email protected]> > Reviewed-by: Vladimir Sementsov-Ogievskiy <[email protected]> > CC: Stefan Hajnoczi <[email protected]> > CC: Fam Zheng <[email protected]> > CC: Kevin Wolf <[email protected]> > CC: Max Reitz <[email protected]> > CC: Jeff Cody <[email protected]> > CC: Eric Blake <[email protected]> > --- > block/dirty-bitmap.c | 6 +++--- > include/block/block_int.h | 2 +- > include/block/dirty-bitmap.h | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c > index 4902ca5..f2bfdcf 100644 > --- a/block/dirty-bitmap.c > +++ b/block/dirty-bitmap.c > @@ -326,14 +326,14 @@ void bdrv_dirty_iter_init(BdrvDirtyBitmap *bitmap, > HBitmapIter *hbi) > } > > void bdrv_set_dirty_bitmap(BdrvDirtyBitmap *bitmap, > - int64_t cur_sector, int nr_sectors) > + int64_t cur_sector, int64_t nr_sectors) > { > assert(bdrv_dirty_bitmap_enabled(bitmap)); > hbitmap_set(bitmap->bitmap, cur_sector, nr_sectors); > } > > void bdrv_reset_dirty_bitmap(BdrvDirtyBitmap *bitmap, > - int64_t cur_sector, int nr_sectors) > + int64_t cur_sector, int64_t nr_sectors) > { > assert(bdrv_dirty_bitmap_enabled(bitmap)); > hbitmap_reset(bitmap->bitmap, cur_sector, nr_sectors); > @@ -361,7 +361,7 @@ void bdrv_undo_clear_dirty_bitmap(BdrvDirtyBitmap > *bitmap, HBitmap *in) > } > > void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, > - int nr_sectors) > + int64_t nr_sectors) > { > BdrvDirtyBitmap *bitmap; > QLIST_FOREACH(bitmap, &bs->dirty_bitmaps, list) { > diff --git a/include/block/block_int.h b/include/block/block_int.h > index 47b9aac..042c118 100644 > --- a/include/block/block_int.h > +++ b/include/block/block_int.h > @@ -767,7 +767,7 @@ void blk_dev_eject_request(BlockBackend *blk, bool force); > bool blk_dev_is_tray_open(BlockBackend *blk); > bool blk_dev_is_medium_locked(BlockBackend *blk); > > -void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, int > nr_sectors); > +void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, int64_t > nr_sect); > bool bdrv_requests_pending(BlockDriverState *bs); > > void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap **out); > diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h > index 80afe60..ee3388f 100644 > --- a/include/block/dirty-bitmap.h > +++ b/include/block/dirty-bitmap.h > @@ -33,9 +33,9 @@ DirtyBitmapStatus bdrv_dirty_bitmap_status(BdrvDirtyBitmap > *bitmap); > int bdrv_get_dirty(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, > int64_t sector); > void bdrv_set_dirty_bitmap(BdrvDirtyBitmap *bitmap, > - int64_t cur_sector, int nr_sectors); > + int64_t cur_sector, int64_t nr_sectors); > void bdrv_reset_dirty_bitmap(BdrvDirtyBitmap *bitmap, > - int64_t cur_sector, int nr_sectors); > + int64_t cur_sector, int64_t nr_sectors); > void bdrv_dirty_iter_init(BdrvDirtyBitmap *bitmap, struct HBitmapIter *hbi); > void bdrv_set_dirty_iter(struct HBitmapIter *hbi, int64_t offset); > int64_t bdrv_get_dirty_count(BdrvDirtyBitmap *bitmap); > Reviewed-by: John Snow <[email protected]>
