aboutsummaryrefslogtreecommitdiff
path: root/aio-posix.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2013-01-16 19:25:51 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2013-01-17 10:51:42 +0100
commit2ea9b58f0bc62445b7ace2381b4c4db7d5597e19 (patch)
treeecf430017866c7275158d2d99f6312972e277a1e /aio-posix.c
parent6bf3ee07ff55aa795010a8e071826f38e9a26112 (diff)
downloadqemu-arm-2ea9b58f0bc62445b7ace2381b4c4db7d5597e19.tar.gz
aio: Fix return value of aio_poll()
aio_poll() must return true if any work is still pending, even if it didn't make progress, so that bdrv_drain_all() doesn't stop waiting too early. The possibility of stopping early occasionally lead to a failed assertion in bdrv_drain_all(), when some in-flight request was missed and the function didn't really drain all requests. In order to make that change, the return value as specified in the function comment must change for blocking = false; fortunately, the return value of blocking = false callers is only used in test cases, so this change shouldn't cause any trouble. Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'aio-posix.c')
-rw-r--r--aio-posix.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/aio-posix.c b/aio-posix.c
index 88d09e1cfb..fe4dbb4523 100644
--- a/aio-posix.c
+++ b/aio-posix.c
@@ -264,5 +264,6 @@ bool aio_poll(AioContext *ctx, bool blocking)
}
}
- return progress;
+ assert(progress || busy);
+ return true;
}