diff options
| author | Peter Maydell | 2017-01-27 12:53:11 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-01-27 12:53:11 +0100 |
| commit | 10aff247d5653cb7beacf2f620639caf5f0e30ca (patch) | |
| tree | fde8bb4c6d7f2813f1c370d39d4310bc9f433e70 | |
| parent | Merge remote-tracking branch 'remotes/famz/tags/for-upstream' into staging (diff) | |
| parent | aio-posix: honor is_external in AioContext polling (diff) | |
| download | qemu-10aff247d5653cb7beacf2f620639caf5f0e30ca.tar.gz qemu-10aff247d5653cb7beacf2f620639caf5f0e30ca.tar.xz qemu-10aff247d5653cb7beacf2f620639caf5f0e30ca.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Thu 26 Jan 2017 10:19:35 GMT
# 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:
aio-posix: honor is_external in AioContext polling
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | aio-posix.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/aio-posix.c b/aio-posix.c index 9453d83743..a8d7090bd8 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -508,7 +508,8 @@ static bool run_poll_handlers_once(AioContext *ctx) QLIST_FOREACH_RCU(node, &ctx->aio_handlers, node) { if (!node->deleted && node->io_poll && - node->io_poll(node->opaque)) { + aio_node_check(ctx, node->is_external) && + node->io_poll(node->opaque)) { progress = true; } |