Message ID | 1424268014-13293-4-git-send-email-vsementsov@parallels.com |
---|---|
State | New |
Headers | show |
On 02/18/2015 09:00 AM, Vladimir Sementsov-Ogievskiy wrote: > Several functions to provide necessary access to BdrvDirtyBitmap for > block-migration.c > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@parallels.com> > --- > block.c | 36 ++++++++++++++++++++++++++++++++++++ > include/block/block.h | 13 +++++++++++++ > 2 files changed, 49 insertions(+) > > diff --git a/block.c b/block.c > index e4547d7..e95a5ae 100644 > --- a/block.c > +++ b/block.c > @@ -5674,6 +5674,42 @@ void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap) > hbitmap_reset(bitmap->bitmap, 0, bitmap->size); > } > > +const char *bdrv_dirty_bitmap_name(const BdrvDirtyBitmap *bitmap) > +{ > + return bitmap->name; > +} > + > +uint64_t bdrv_dirty_bitmap_data_size(const BdrvDirtyBitmap *bitmap, > + uint64_t count) > +{ > + return hbitmap_data_size(bitmap->bitmap, count); > +} > + > +void bdrv_dirty_bitmap_serialize_part(const BdrvDirtyBitmap *bitmap, > + uint8_t *buf, uint64_t start, > + uint64_t count) > +{ > + hbitmap_serialize_part(bitmap->bitmap, buf, start, count); > +} > + > +void bdrv_dirty_bitmap_deserialize_part(BdrvDirtyBitmap *bitmap, > + uint8_t *buf, uint64_t start, > + uint64_t count) > +{ > + hbitmap_deserialize_part(bitmap->bitmap, buf, start, count); > +} > + > +void bdrv_dirty_bitmap_deserialize_zeroes(BdrvDirtyBitmap *bitmap, > + uint64_t start, uint64_t count) > +{ > + hbitmap_deserialize_zeroes(bitmap->bitmap, start, count); > +} > + > +void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap) > +{ > + hbitmap_deserialize_finish(bitmap->bitmap); > +} > + > static void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, > int nr_sectors) > { > diff --git a/include/block/block.h b/include/block/block.h > index c9d96a6..c6a928d 100644 > --- a/include/block/block.h > +++ b/include/block/block.h > @@ -474,6 +474,19 @@ 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); > > +const char *bdrv_dirty_bitmap_name(const BdrvDirtyBitmap *bitmap); > +uint64_t bdrv_dirty_bitmap_data_size(const BdrvDirtyBitmap *bitmap, > + uint64_t count); > +void bdrv_dirty_bitmap_serialize_part(const BdrvDirtyBitmap *bitmap, > + uint8_t *buf, uint64_t start, > + uint64_t count); > +void bdrv_dirty_bitmap_deserialize_part(BdrvDirtyBitmap *bitmap, > + uint8_t *buf, uint64_t start, > + uint64_t count); > +void bdrv_dirty_bitmap_deserialize_zeroes(BdrvDirtyBitmap *bitmap, > + uint64_t start, uint64_t count); > +void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap); > + > void bdrv_enable_copy_on_read(BlockDriverState *bs); > void bdrv_disable_copy_on_read(BlockDriverState *bs); > > Reviewed-by: John Snow <jsnow@redhat.com>
diff --git a/block.c b/block.c index e4547d7..e95a5ae 100644 --- a/block.c +++ b/block.c @@ -5674,6 +5674,42 @@ void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap) hbitmap_reset(bitmap->bitmap, 0, bitmap->size); } +const char *bdrv_dirty_bitmap_name(const BdrvDirtyBitmap *bitmap) +{ + return bitmap->name; +} + +uint64_t bdrv_dirty_bitmap_data_size(const BdrvDirtyBitmap *bitmap, + uint64_t count) +{ + return hbitmap_data_size(bitmap->bitmap, count); +} + +void bdrv_dirty_bitmap_serialize_part(const BdrvDirtyBitmap *bitmap, + uint8_t *buf, uint64_t start, + uint64_t count) +{ + hbitmap_serialize_part(bitmap->bitmap, buf, start, count); +} + +void bdrv_dirty_bitmap_deserialize_part(BdrvDirtyBitmap *bitmap, + uint8_t *buf, uint64_t start, + uint64_t count) +{ + hbitmap_deserialize_part(bitmap->bitmap, buf, start, count); +} + +void bdrv_dirty_bitmap_deserialize_zeroes(BdrvDirtyBitmap *bitmap, + uint64_t start, uint64_t count) +{ + hbitmap_deserialize_zeroes(bitmap->bitmap, start, count); +} + +void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap) +{ + hbitmap_deserialize_finish(bitmap->bitmap); +} + static void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors) { diff --git a/include/block/block.h b/include/block/block.h index c9d96a6..c6a928d 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -474,6 +474,19 @@ 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); +const char *bdrv_dirty_bitmap_name(const BdrvDirtyBitmap *bitmap); +uint64_t bdrv_dirty_bitmap_data_size(const BdrvDirtyBitmap *bitmap, + uint64_t count); +void bdrv_dirty_bitmap_serialize_part(const BdrvDirtyBitmap *bitmap, + uint8_t *buf, uint64_t start, + uint64_t count); +void bdrv_dirty_bitmap_deserialize_part(BdrvDirtyBitmap *bitmap, + uint8_t *buf, uint64_t start, + uint64_t count); +void bdrv_dirty_bitmap_deserialize_zeroes(BdrvDirtyBitmap *bitmap, + uint64_t start, uint64_t count); +void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap); + void bdrv_enable_copy_on_read(BlockDriverState *bs); void bdrv_disable_copy_on_read(BlockDriverState *bs);
Several functions to provide necessary access to BdrvDirtyBitmap for block-migration.c Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@parallels.com> --- block.c | 36 ++++++++++++++++++++++++++++++++++++ include/block/block.h | 13 +++++++++++++ 2 files changed, 49 insertions(+)