diff options
| author | John Snow | 2019-07-29 22:35:53 +0200 |
|---|---|---|
| committer | John Snow | 2019-08-16 22:28:02 +0200 |
| commit | b7661ca5d84a7d330acc3c3f471e757e55261f84 (patch) | |
| tree | d64e23f1a15c05c2c3a68271167ac50b4f4dd9ab /include | |
| parent | hbitmap: enable merging across granularities (diff) | |
| download | qemu-b7661ca5d84a7d330acc3c3f471e757e55261f84.tar.gz qemu-b7661ca5d84a7d330acc3c3f471e757e55261f84.tar.xz qemu-b7661ca5d84a7d330acc3c3f471e757e55261f84.zip | |
block/dirty-bitmap: add bdrv_dirty_bitmap_merge_internal
I'm surprised it didn't come up sooner, but sometimes we have a +busy
bitmap as a source. This is dangerous from the QMP API, but if we are
the owner that marked the bitmap busy, it's safe to merge it using it as
a read only source.
It is not safe in the general case to allow users to read from in-use
bitmaps, so create an internal variant that foregoes the safety
checking.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190709232550.10724-10-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block_int.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/block/block_int.h b/include/block/block_int.h index 80953ac8ae..aa697f1f69 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -1253,6 +1253,9 @@ void bdrv_set_dirty(BlockDriverState *bs, int64_t offset, int64_t bytes); void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap **out); void bdrv_restore_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap *backup); +bool bdrv_dirty_bitmap_merge_internal(BdrvDirtyBitmap *dest, + const BdrvDirtyBitmap *src, + HBitmap **backup, bool lock); void bdrv_inc_in_flight(BlockDriverState *bs); void bdrv_dec_in_flight(BlockDriverState *bs); |