[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/31] aio-posix: don't pass ns timeout to epoll_wait()
From: |
Stefan Hajnoczi |
Subject: |
[PULL 06/31] aio-posix: don't pass ns timeout to epoll_wait() |
Date: |
Sat, 22 Feb 2020 08:50:05 +0000 |
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 <address@hidden>
Reviewed-by: Sergio Lopez <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
util/aio-posix.c | 3 +++
1 file changed, 3 insertions(+)
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,
--
2.24.1
- [PULL 00/31] Block patches, Stefan Hajnoczi, 2020/02/22
- [PULL 01/31] virtio: increase virtqueue size for virtio-scsi and virtio-blk, Stefan Hajnoczi, 2020/02/22
- [PULL 02/31] aio-posix: avoid reacquiring rcu_read_lock() when polling, Stefan Hajnoczi, 2020/02/22
- [PULL 03/31] rcu_queue: add QSLIST functions, Stefan Hajnoczi, 2020/02/22
- [PULL 04/31] util/async: make bh_aio_poll() O(1), Stefan Hajnoczi, 2020/02/22
- [PULL 05/31] aio-posix: fix use after leaving scope in aio_poll(), Stefan Hajnoczi, 2020/02/22
- [PULL 06/31] aio-posix: don't pass ns timeout to epoll_wait(),
Stefan Hajnoczi <=
- [PULL 07/31] qemu/queue.h: add QLIST_SAFE_REMOVE(), Stefan Hajnoczi, 2020/02/22
- [PULL 08/31] aio-posix: make AioHandler deletion O(1), Stefan Hajnoczi, 2020/02/22
- [PULL 09/31] aio-posix: make AioHandler dispatch O(1) with epoll, Stefan Hajnoczi, 2020/02/22
- [PULL 10/31] softmmu: move vl.c to softmmu/, Stefan Hajnoczi, 2020/02/22
- [PULL 11/31] softmmu: split off vl.c:main() into main.c, Stefan Hajnoczi, 2020/02/22
- [PULL 12/31] module: check module wasn't already initialized, Stefan Hajnoczi, 2020/02/22
- [PULL 13/31] fuzz: add FUZZ_TARGET module type, Stefan Hajnoczi, 2020/02/22
- [PULL 14/31] qtest: add qtest_server_send abstraction, Stefan Hajnoczi, 2020/02/22
- [PULL 15/31] libqtest: add a layer of abstraction to send/recv, Stefan Hajnoczi, 2020/02/22
- [PULL 16/31] libqtest: make bufwrite rely on the TransportOps, Stefan Hajnoczi, 2020/02/22