OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

yield_until_fd_readable: make it work with any AioContect 

Simply use qemu_get_current_aio_context().

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
Message-Id: <20191024045610.9071-1-dietmar@proxmox.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Dietmar Maurer 2019-10-24 06:56:10 +02:00 committed by Stefan Hajnoczi
parent 7bfde688fb
commit d154ef37ff
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util/qemu-coroutine-io.c
View File

@ -67,6 +67,7 @@ qemu_co_send_recv(int sockfd, void *buf, size_t bytes, bool do_send)
} }
typedef struct { typedef struct {
AioContext *ctx;
Coroutine *co; Coroutine *co;
int fd; int fd;
} FDYieldUntilData; } FDYieldUntilData;
@ -74,7 +75,7 @@ typedef struct {
static void fd_coroutine_enter(void *opaque) static void fd_coroutine_enter(void *opaque)
{ {
FDYieldUntilData *data = 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); qemu_coroutine_enter(data->co);
} }
@ -83,8 +84,10 @@ void coroutine_fn yield_until_fd_readable(int fd)
FDYieldUntilData data; FDYieldUntilData data;
assert(qemu_in_coroutine()); assert(qemu_in_coroutine());
data.ctx = qemu_get_current_aio_context();
data.co = qemu_coroutine_self(); data.co = qemu_coroutine_self();
data.fd = fd; 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(); qemu_coroutine_yield();
} }