v3: rebase on master, one patch is already merged. Vladimir Sementsov-Ogievskiy (3): 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-io.h | 2 +- include/qemu/hbitmap.h | 15 ++----------- block/backup.c | 6 ++---- block/dirty-bitmap.c | 26 ++++++++++------------ block/monitor/bitmap-qmp-cmds.c | 38 +++++++++++++++++---------------- util/hbitmap.c | 25 ++++++---------------- 6 files changed, 43 insertions(+), 69 deletions(-) -- 2.35.1
