diff options
author | 2015-11-09 11:20:51 +0000 | |
---|---|---|
committer | 2015-11-09 11:20:51 +0000 | |
commit | 9d5c1dc117d1ad881bbc76f6990ee1f9e9f8ef7f (patch) | |
tree | 90d4dace696dbff6d0414de85353fdc6b6d39bc6 /kvm-stub.c | |
parent | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging (diff) | |
parent | blockdev: acquire AioContext in hmp_commit() (diff) | |
download | qemu-9d5c1dc117d1ad881bbc76f6990ee1f9e9f8ef7f.tar.xz qemu-9d5c1dc117d1ad881bbc76f6990ee1f9e9f8ef7f.zip |
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 'kvm-stub.c')
0 files changed, 0 insertions, 0 deletions