diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-09 11:20:51 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-09 11:20:51 +0000 |
| commit | 9d5c1dc117d1ad881bbc76f6990ee1f9e9f8ef7f (patch) | |
| tree | 90d4dace696dbff6d0414de85353fdc6b6d39bc6 /qapi | |
| parent | b3a9e57d92dff7dd5822f322e4eb49af9e1b70b8 (diff) | |
| parent | 84aa0140dd4f04f5d993f0db14c40da8d3de2706 (diff) | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Mon 09 Nov 2015 10:08:17 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/block-pull-request:
blockdev: acquire AioContext in hmp_commit()
monitor: add missed aio_context_acquire into vm_completion call
aio: Introduce aio-epoll.c
aio: Introduce aio_context_setup
aio: Introduce aio_external_disabled
dataplane: support non-contigious s/g
dataplane: simplify indirect descriptor read
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
0 files changed, 0 insertions, 0 deletions