From: Peter Maydell Date: Wed, 31 Mar 2021 15:38:49 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into... X-Git-Tag: v6.0.0-rc2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1bd16067b652cce41a9214d0c62c73d5b45ab4b1;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging Pull request A fix for VDI image files and more generally for CoRwlock. # gpg: Signature made Wed 31 Mar 2021 10:50:39 BST # gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi " [full] # gpg: aka "Stefan Hajnoczi " [full] # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha-gitlab/tags/block-pull-request: test-coroutine: Add rwlock downgrade test test-coroutine: Add rwlock upgrade test coroutine-lock: Reimplement CoRwlock to fix downgrade bug coroutine-lock: Store the coroutine in the CoWaitRecord only once block/vdi: Don't assume that blocks are larger than VdiHeader block/vdi: When writing new bmap entry fails, don't leak the buffer Signed-off-by: Peter Maydell --- 1bd16067b652cce41a9214d0c62c73d5b45ab4b1