diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2020-02-14 17:17:09 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2020-02-22 08:26:47 +0000 |
| commit | ca8c6b22754b0f17818b1d1910d31f0aa1a49cc7 (patch) | |
| tree | fe5d04fa9f2ab59f7bbb37fc1b3997e8ea902703 /util | |
| parent | ff29ed3a331d0cd26bcd30f7cd6c0c96c7d44eed (diff) | |
aio-posix: don't pass ns timeout to epoll_wait()
Don't pass the nanosecond timeout into epoll_wait(), which expects
milliseconds.
The epoll_wait() timeout value does not matter if qemu_poll_ns()
determined that the poll fd is ready, but passing a value in the wrong
units is still ugly. Pass a 0 timeout to epoll_wait() instead.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20200214171712.541358-3-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/aio-posix.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/util/aio-posix.c b/util/aio-posix.c index c964627a03..58765e581e 100644 --- a/util/aio-posix.c +++ b/util/aio-posix.c @@ -117,6 +117,9 @@ static int aio_epoll(AioContext *ctx, int64_t timeout) if (timeout > 0) { ret = qemu_poll_ns(&pfd, 1, timeout); + if (ret > 0) { + timeout = 0; + } } if (timeout <= 0 || ret > 0) { ret = epoll_wait(ctx->epollfd, events, |