On 09/14/2018 11:15 AM, Vladimir Sementsov-Ogievskiy wrote:
> This is a last brick, necessary to play with nbd bitmap export in
> conjunction with image fleecing.
>
> v3:
> 01: fix type in commit message, add John's r-b
> 02: splitted refactoring
> 03: improve commit message, split some refactoring to 02
> 04: add John's r-b
> 05: drop extra state variable, make it local instead. John's r-b.
>
>
> v2: don't compare with v1, it is changed a lot, to do the whole thing
> in .prepare instead of .commit. It is needed to be compatible with
> backup block job transaction actions [John]
>
> Vladimir Sementsov-Ogievskiy (5):
> dirty-bitmap: switch assert-fails to errors in bdrv_merge_dirty_bitmap
> dirty-bitmap: rename bdrv_undo_clear_dirty_bitmap
> dirty-bitmap: make it possible to restore bitmap after merge
> blockdev: rename block-dirty-bitmap-clear transaction handlers
> qapi: add transaction support for x-block-dirty-bitmap-merge
>
> qapi/transaction.json | 2 ++
> include/block/block_int.h | 2 +-
> include/block/dirty-bitmap.h | 2 +-
> include/qemu/hbitmap.h | 25 +++++++++------
> block/dirty-bitmap.c | 36 +++++++++++++++++-----
> blockdev.c | 59 +++++++++++++++++++++++++-----------
> util/hbitmap.c | 11 +++++--
> 7 files changed, 99 insertions(+), 38 deletions(-)
>
Thanks, applied to my bitmaps tree:
https://github.com/jnsnow/qemu/commits/bitmaps
https://github.com/jnsnow/qemu.git
--js