From: Peter Maydell Date: Tue, 22 Dec 2015 14:21:42 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5dc42c186d63b7b338594fc071cf290805dcc5a5;p=qemu.git Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging # gpg: Signature made Tue 22 Dec 2015 08:52:55 GMT using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi " # gpg: aka "Stefan Hajnoczi " * remotes/stefanha/tags/block-pull-request: sdhci: add optional quirk property to disable card insertion/removal interrupts sdhci: don't raise a command index error for an unexpected response sd: sdhci: Delete over-zealous power check scripts/gdb: Fix a python exception in mtree.py parallels: add format spec block/mirror: replace IOV_MAX with blk_get_max_iov() block: replace IOV_MAX with BlockLimits.max_iov block-backend: add blk_get_max_iov() block: add BlockLimits.max_iov field virtio-blk: trivial code optimization Signed-off-by: Peter Maydell --- 5dc42c186d63b7b338594fc071cf290805dcc5a5