[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4] yield_until_fd_readable: make it work with any AioContect
From: |
Dietmar Maurer |
Subject: |
[PATCH v4] yield_until_fd_readable: make it work with any AioContect |
Date: |
Thu, 24 Oct 2019 06:56:10 +0200 |
Simply use qemu_get_current_aio_context().
Signed-off-by: Dietmar Maurer <address@hidden>
---
Changelog for v4:
- avoid unsafe cast and keep fd_coroutine_enter()
Changelog for v3:
- use (IOHandler *) instead of ((void (*)(void *))
- coding style: fix max line length
Changelog for v2:
- use correct read handler in aio_set_fd_handler (instead of write handler)
util/qemu-coroutine-io.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/util/qemu-coroutine-io.c b/util/qemu-coroutine-io.c
index 44a8969a69..5b80bb416f 100644
--- a/util/qemu-coroutine-io.c
+++ b/util/qemu-coroutine-io.c
@@ -67,6 +67,7 @@ qemu_co_send_recv(int sockfd, void *buf, size_t bytes, bool
do_send)
}
typedef struct {
+ AioContext *ctx;
Coroutine *co;
int fd;
} FDYieldUntilData;
@@ -74,7 +75,7 @@ typedef struct {
static void fd_coroutine_enter(void *opaque)
{
FDYieldUntilData *data = opaque;
- qemu_set_fd_handler(data->fd, NULL, NULL, NULL);
+ aio_set_fd_handler(data->ctx, data->fd, false, NULL, NULL, NULL, NULL);
qemu_coroutine_enter(data->co);
}
@@ -83,8 +84,10 @@ void coroutine_fn yield_until_fd_readable(int fd)
FDYieldUntilData data;
assert(qemu_in_coroutine());
+ data.ctx = qemu_get_current_aio_context();
data.co = qemu_coroutine_self();
data.fd = fd;
- qemu_set_fd_handler(fd, fd_coroutine_enter, NULL, &data);
+ aio_set_fd_handler(
+ data.ctx, fd, false, fd_coroutine_enter, NULL, NULL, &data);
qemu_coroutine_yield();
}
--
2.20.1
- [PATCH v4] yield_until_fd_readable: make it work with any AioContect,
Dietmar Maurer <=