Commit 10aff247 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b944b2ec 59c9f437

aio-posix.c

+2 −1
Original line number Diff line number Diff line
@@ -508,6 +508,7 @@ static bool run_poll_handlers_once(AioContext *ctx) 


    QLIST_FOREACH_RCU(node, &ctx->aio_handlers, node) {

        if (!node->deleted && node->io_poll &&

            aio_node_check(ctx, node->is_external) &&

            node->io_poll(node->opaque)) {

            progress = true;

        }