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 /util/event_notifier-posix.c | |
| 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 'util/event_notifier-posix.c')
| -rw-r--r-- | util/event_notifier-posix.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c index e150301c33..c1f0d79b34 100644 --- a/util/event_notifier-posix.c +++ b/util/event_notifier-posix.c @@ -91,9 +91,11 @@ int event_notifier_get_fd(const EventNotifier *e) } int event_notifier_set_handler(EventNotifier *e, + bool is_external, EventNotifierHandler *handler) { - qemu_set_fd_handler(e->rfd, (IOHandler *)handler, NULL, e); + aio_set_fd_handler(iohandler_get_aio_context(), e->rfd, is_external, + (IOHandler *)handler, NULL, e); return 0; } |