diff options
| author | Peter Maydell | 2015-08-14 17:52:34 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-08-14 17:52:34 +0200 |
| commit | 074a9925e1cfd659d5376dcaccd1436d3840e611 (patch) | |
| tree | 55eaba21dfd87054a46069e79de852d5d440e06e /include | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff) | |
| parent | mirror: Fix coroutine reentrance (diff) | |
| download | qemu-074a9925e1cfd659d5376dcaccd1436d3840e611.tar.gz qemu-074a9925e1cfd659d5376dcaccd1436d3840e611.tar.xz qemu-074a9925e1cfd659d5376dcaccd1436d3840e611.zip | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Fri 14 Aug 2015 14:54:27 BST using RSA key ID C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
mirror: Fix coroutine reentrance
block/mirror: limit qiov to IOV_MAX elements
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions