diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-07-22 09:33:03 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-07-22 09:33:03 +0100 |
| commit | 423a4849db5244f9af152e3b69c5e0715f2ee7a5 (patch) | |
| tree | 89e724bf1cd142b1786fcc85675077c3138e4c23 /cpus-common.c | |
| parent | e77c8b8b8e933414ef07dbed04e02973fccffeb0 (diff) | |
| parent | 955171e4417bf39edb5503e694501e082a757731 (diff) | |
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 <eblake@redhat.com>" [full]
# gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [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 <peter.maydell@linaro.org>
Diffstat (limited to 'cpus-common.c')
0 files changed, 0 insertions, 0 deletions