diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2019-02-18 14:09:32 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2019-02-25 15:03:19 +0100 |
| commit | 6886ceaf61c2399419258246a064485e9b1e51ac (patch) | |
| tree | 81609e35fb15b3b34e4edd2aef68e243ff32ca70 /io/channel.c | |
| parent | 5ad81b4946baf948c65cf7e1436d9b74803c1280 (diff) | |
io: Make qio_channel_yield() interruptible
Similar to how qemu_co_sleep_ns() allows preemption from an external
coroutine entry, allow reentering qio_channel_yield() early.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'io/channel.c')
| -rw-r--r-- | io/channel.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/io/channel.c b/io/channel.c index 8dd0684f5d..303376e08d 100644 --- a/io/channel.c +++ b/io/channel.c @@ -469,6 +469,16 @@ void coroutine_fn qio_channel_yield(QIOChannel *ioc, } qio_channel_set_aio_fd_handlers(ioc); qemu_coroutine_yield(); + + /* Allow interrupting the operation by reentering the coroutine other than + * through the aio_fd_handlers. */ + if (condition == G_IO_IN && ioc->read_coroutine) { + ioc->read_coroutine = NULL; + qio_channel_set_aio_fd_handlers(ioc); + } else if (condition == G_IO_OUT && ioc->write_coroutine) { + ioc->write_coroutine = NULL; + qio_channel_set_aio_fd_handlers(ioc); + } } |