From: Peter Maydell Date: Thu, 22 Jul 2021 08:33:03 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/ericb/tags/pull-bitmaps-2021-07-21' into staging X-Git-Tag: v6.1.0-rc1~13 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=423a4849db5244f9af152e3b69c5e0715f2ee7a5;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/ericb/tags/pull-bitmaps-2021-07-21' into staging block bitmaps patches for 2021-07-21 - fix 'qemu-img convert --bitmaps' handling of qcow2 files with inconsistent bitmaps # gpg: Signature made Wed 21 Jul 2021 20:16:09 BST # gpg: using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A # gpg: Good signature from "Eric Blake " [full] # gpg: aka "Eric Blake (Free Software Programmer) " [full] # gpg: aka "[jpeg image of size 6874]" [full] # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A * remotes/ericb/tags/pull-bitmaps-2021-07-21: qemu-img: Add --skip-broken-bitmaps for 'convert --bitmaps' qemu-img: Fail fast on convert --bitmaps with inconsistent bitmap iotests: Improve and rename test 291 to qemu-img-bitmap Signed-off-by: Peter Maydell --- 423a4849db5244f9af152e3b69c5e0715f2ee7a5