diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-22 16:17:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-22 16:17:12 +0100 |
| commit | 53343338a6e7b83777b82803398572b40afc8c0f (patch) | |
| tree | a6b16ffcb414941d0cd6c63d0c7c3050a3a73451 /include/qemu/main-loop.h | |
| parent | ee1e0f8e5d3682c561edcdceccff72b9d9b16d8b (diff) | |
| parent | ab27c3b5e7408693dde0b565f050aa55c4a1bcef (diff) | |
| download | qemu-53343338a6e7b83777b82803398572b40afc8c0f.tar.gz | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Mirror block job fixes for 2.6.0-rc4
# gpg: Signature made Fri 22 Apr 2016 15:46:41 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
mirror: Workaround for unexpected iohandler events during completion
aio-posix: Skip external nodes in aio_dispatch
virtio: Mark host notifiers as external
event-notifier: Add "is_external" parameter
iohandler: Introduce iohandler_get_aio_context
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu/main-loop.h')
| -rw-r--r-- | include/qemu/main-loop.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h index 99769093fc..19b5de3dd5 100644 --- a/include/qemu/main-loop.h +++ b/include/qemu/main-loop.h @@ -204,6 +204,7 @@ void qemu_set_fd_handler(int fd, void *opaque); GSource *iohandler_get_g_source(void); +AioContext *iohandler_get_aio_context(void); #ifdef CONFIG_POSIX /** * qemu_add_child_watch: Register a child process for reaping. |