diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-18 18:13:01 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-18 18:13:01 +0100 |
| commit | a098fbc025095a0d98156ada7eac59de97c16499 (patch) | |
| tree | 9cebea51d8a9a5b994d4d2294f07695774ac63af /block/win32-aio.c | |
| parent | 3913d3707e3debfbf0d2d014a1a793394993b088 (diff) | |
| parent | e1029ae26d96d5de78c2d9af5eddcea92e73a46a (diff) | |
| download | qemu-a098fbc025095a0d98156ada7eac59de97c16499.zip qemu-a098fbc025095a0d98156ada7eac59de97c16499.tar.gz qemu-a098fbc025095a0d98156ada7eac59de97c16499.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Mon 18 Jul 2016 17:58:27 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
MAINTAINERS: Add include/block/aio.h to block I/O path section
virtio-blk: dataplane cleanup
checkpatch: consider git extended headers valid patches
aio-posix: remove useless parameter
linux-aio: prevent submitting more than MAX_EVENTS
aio_ctx_check: follow CODING_STYLE
linux-aio: share one LinuxAioState within an AioContext
spec/parallels: fix a mistake
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/win32-aio.c')
| -rw-r--r-- | block/win32-aio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/win32-aio.c b/block/win32-aio.c index 2d509a9..95e3ab1 100644 --- a/block/win32-aio.c +++ b/block/win32-aio.c @@ -27,7 +27,7 @@ #include "block/block_int.h" #include "qemu/module.h" #include "block/aio.h" -#include "raw-aio.h" +#include "block/raw-aio.h" #include "qemu/event_notifier.h" #include "qemu/iov.h" #include <windows.h> |