3 Commits

Author	SHA1	Message	Date
Peter Krempa	9d039863e2	qemu: block: Remove 'active-write' bitmap even if there are no bitmaps to merge ... The 'libvirt-tmp-activewrite' bitmap is added during the 'pivot' operation of block copy and active layer block commit operations regardless of whether there are any bitmaps to merge, but was not removed unless a bitmap was merged. This meant that subsequent attempts to merge into the same image would fail. Fix it by checking whether the 'libvirt-tmp-activewrite' would be used by the code and don't skip the code which would delete it. This is a regression introduced when we switched to the new code for block commit in <20a7abc2d2d> and for block copy in <7bfff40fdfe5>. The actual bug originates from <4fa8654ece>. https://bugzilla.redhat.com/show_bug.cgi?id=1857735 Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>	2020-07-21 09:52:59 +02:00
Peter Krempa	20a7abc2d2	qemu: Rewrite bitmap handling for block commit ... Reuse qemuBlockGetBitmapMergeActions which allows removing the ad-hoc implementation of bitmap merging for block commit. The new approach is way simpler and more robust and also allows us to get rid of the disabling of bitmaps done prior to the start as we actually do want to update the bitmaps in the base. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>	2020-06-22 16:04:30 +02:00
Peter Krempa	cc1a33b599	qemublocktest: Add 'empty' case for checkpoint bitmap handling ... Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>	2020-06-22 16:04:29 +02:00