From: Peter Maydell Date: Tue, 16 Aug 2016 08:32:40 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=66940d749197270c310c576af9e6f77478d1ee8f;p=qemu.git Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging Block layer patches for 2.7.0-rc3 # gpg: Signature made Mon 15 Aug 2016 14:55:46 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: iotests: Test case for wrong runtime option types block/nbd: Store runtime option values block/blkdebug: Store config filename block/nbd: Use QemuOpts for runtime options block/ssh: Use QemuOpts for runtime options Signed-off-by: Peter Maydell --- 66940d749197270c310c576af9e6f77478d1ee8f