diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2013-01-16 19:25:51 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2013-01-17 10:51:42 +0100 |
| commit | 2ea9b58f0bc62445b7ace2381b4c4db7d5597e19 (patch) | |
| tree | ecf430017866c7275158d2d99f6312972e277a1e /tests | |
| parent | 6bf3ee07ff55aa795010a8e071826f38e9a26112 (diff) | |
| download | qemu-2ea9b58f0bc62445b7ace2381b4c4db7d5597e19.tar.gz qemu-2ea9b58f0bc62445b7ace2381b4c4db7d5597e19.tar.bz2 qemu-2ea9b58f0bc62445b7ace2381b4c4db7d5597e19.zip | |
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 'tests')
| -rw-r--r-- | tests/test-aio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test-aio.c b/tests/test-aio.c index e4ebef76b9..c1738706cd 100644 --- a/tests/test-aio.c +++ b/tests/test-aio.c @@ -315,13 +315,13 @@ static void test_wait_event_notifier_noflush(void) event_notifier_set(&data.e); g_assert(aio_poll(ctx, false)); g_assert_cmpint(data.n, ==, 1); - g_assert(!aio_poll(ctx, false)); + g_assert(aio_poll(ctx, false)); g_assert_cmpint(data.n, ==, 1); event_notifier_set(&data.e); g_assert(aio_poll(ctx, false)); g_assert_cmpint(data.n, ==, 2); - g_assert(!aio_poll(ctx, false)); + g_assert(aio_poll(ctx, false)); g_assert_cmpint(data.n, ==, 2); event_notifier_set(&dummy.e); |