dirty-bitmap: make it possible to restore bitmap after merge

Add backup parameter to bdrv_merge_dirty_bitmap() to be used then with
bdrv_restore_dirty_bitmap() if it needed to restore the bitmap after
merge operation.

This is needed to implement bitmap merge transaction action in further
commit.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: John Snow <jsnow@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2018-10-29 16:23:15 -04:00 committed by John Snow
parent 56bd662497
commit fa000f2f9f
5 changed files with 39 additions and 16 deletions

View file

@ -73,16 +73,23 @@ void hbitmap_truncate(HBitmap *hb, uint64_t size);
/**
* hbitmap_merge:
* @a: The bitmap to store the result in.
* @b: The bitmap to merge into @a.
* @return true if the merge was successful,
* false if it was not attempted.
*
* Merge two bitmaps together.
* A := A (BITOR) B.
* B is left unmodified.
* Store result of merging @a and @b into @result.
* @result is allowed to be equal to @a or @b.
*
* Return true if the merge was successful,
* false if it was not attempted.
*/
bool hbitmap_merge(HBitmap *a, const HBitmap *b);
bool hbitmap_merge(const HBitmap *a, const HBitmap *b, HBitmap *result);
/**
* hbitmap_can_merge:
*
* hbitmap_can_merge(a, b) && hbitmap_can_merge(a, result) is sufficient and
* necessary for hbitmap_merge will not fail.
*
*/
bool hbitmap_can_merge(const HBitmap *a, const HBitmap *b);
/**
* hbitmap_empty: