[PATCH v2 0/4] block/dirty-bitmaps: fix and improve bitmap merge

[Vladimir Sementsov-Ogievskiy]

v2:
01: take older patch which is better and has r-b
02: add Nikita's r-b
03: rewrite to keep original logic of no backup on failure path
04: fix comment, add missed "ret = true", keep Nikita's r-b

Vladimir Sementsov-Ogievskiy (4):
  block/dirty-bitmap: bdrv_merge_dirty_bitmap(): add return value
  block: block_dirty_bitmap_merge(): fix error path
  block: improve block_dirty_bitmap_merge(): don't allocate extra bitmap
  block: simplify handling of try to merge different sized bitmaps

 include/block/block_int.h       |  2 +-
 include/block/dirty-bitmap.h    |  2 +-
 include/qemu/hbitmap.h          | 15 ++----------
 block/backup.c                  |  6 ++---
 block/dirty-bitmap.c            | 36 ++++++++++++++---------------
 block/monitor/bitmap-qmp-cmds.c | 41 ++++++++++++++++-----------------
 util/hbitmap.c                  | 25 ++++++--------------
 7 files changed, 51 insertions(+), 76 deletions(-)

-- 
2.31.1