summaryrefslogtreecommitdiff
path: root/aio-win32.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2013-01-16 19:25:51 +0100
committerMichael Roth <mdroth@linux.vnet.ibm.com>2013-01-21 13:23:52 -0600
commit9d173df5538a73cb8be53684ab19ea201c783663 (patch)
tree217e70c1c4efbae80bd39a3ea29d1561123a73cf /aio-win32.c
parent204dd38c2da72687848d1a6fd2a81a8eaac6bf78 (diff)
downloadqemu-9d173df5538a73cb8be53684ab19ea201c783663.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> (cherry picked from commit 2ea9b58f0bc62445b7ace2381b4c4db7d5597e19) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'aio-win32.c')
-rw-r--r--aio-win32.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/aio-win32.c b/aio-win32.c
index cec4646635..7886e9829f 100644
--- a/aio-win32.c
+++ b/aio-win32.c
@@ -214,5 +214,6 @@ bool aio_poll(AioContext *ctx, bool blocking)
events[ret - WAIT_OBJECT_0] = events[--count];
}
- return progress;
+ assert(progress || busy);
+ return true;
}