From: Vladimir Sementsov-Ogievskiy <vsement...@openvz.org> v4: 01,03: add Kevin's r-b 02: add hbitmap_free() on success patch if local_backup is not needed
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 | 40 ++++++++++++++++++--------------- util/hbitmap.c | 25 ++++++--------------- 6 files changed, 45 insertions(+), 69 deletions(-) -- 2.35.1