From: Peter Maydell Date: Fri, 11 Aug 2017 14:11:50 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging X-Git-Tag: v2.10.0-rc3~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9db6ffc76676731a25a5538ab71e8ca6ac234f80;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging Block layer patches for 2.10.0-rc3 # gpg: Signature made Fri 11 Aug 2017 15:02:58 BST # gpg: using RSA key 0x7F09B272C88F2FD6 # gpg: Good signature from "Kevin Wolf " # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6 * remotes/kevin/tags/for-upstream: qemu-iotests: fix 185 file-posix: Do runtime check for ofd lock API osdep: Add runtime OFD lock detection qcow2: Check failure of bdrv_getlength() qcow2: Drop debugging dump_refcounts() vpc: Check failure of bdrv_getlength() tests/multiboot: Fix whitespace failure Signed-off-by: Peter Maydell --- 9db6ffc76676731a25a5538ab71e8ca6ac234f80