openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE----- 

iQEcBAABAgAGBQJYic03AAoJEJykq7OBq3PIckMH+wYnMscBO8FhVQKmKnTOWi6K
 ZV3v7edC3sLUkpguUqJKg21N2Hj92zBMgNwqwbUWCyFR+KJbHRRiFdBJBdou9iWo
 Rq5VBQaZVRY/vKBsJQEwB0CAMtk2/VcvS4GN7sTSPkhWMaZvqGngPfRn4qBfwDv+
 o1eHQyeyKLLxU778hitq5c7bKdIjSFvFplZkaBErZrnmEARHNe22YNvW3HpZHMY6
 3YelqrFGI94wpfntpDC0vRcYJIYxQoVJH5t5bzULus+9F0O94ZK3iTZ5pIVRXUuA
 n84OsewxOEedk0hi5CYBEtK96n8D8pXo3QLhfuq6fyorRgJOW0pV6nTHOGlse/4=
 =dsTc
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2017-01-27 11:53:11 +00:00
parent b944b2ec46 59c9f437c5
commit 10aff247d5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aio-posix.c
View File

@ -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;
}