summary refs log tree commit diff stats
path: root/io/channel.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2017-05-26 11:36:41 +0200
committerDaniel P. Berrange <berrange@redhat.com>2017-05-26 10:38:08 +0100
commit8f7168b34323ceec4d5faff797e7bcf1be57e6be (patch)
tree1684a76a7ead31df79c863bec69473adddad124b /io/channel.c
parent9964e96dc9999cf7f7c936ee854a795415d19b60 (diff)
downloadfocaccia-qemu-8f7168b34323ceec4d5faff797e7bcf1be57e6be.tar.gz
focaccia-qemu-8f7168b34323ceec4d5faff797e7bcf1be57e6be.zip
io: simplify qio_channel_attach_aio_context
If properly preceded by qio_channel_detach_aio_context, this function really
has nothing to do except setting ioc->ctx.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'io/channel.c')
-rw-r--r--io/channel.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/io/channel.c b/io/channel.c
index cdf74540c1..1cfb8b33a2 100644
--- a/io/channel.c
+++ b/io/channel.c
@@ -279,15 +279,9 @@ static void qio_channel_set_aio_fd_handlers(QIOChannel *ioc)
 void qio_channel_attach_aio_context(QIOChannel *ioc,
                                     AioContext *ctx)
 {
-    AioContext *old_ctx;
-    if (ioc->ctx == ctx) {
-        return;
-    }
-
-    old_ctx = ioc->ctx ? ioc->ctx : iohandler_get_aio_context();
-    qio_channel_set_aio_fd_handler(ioc, old_ctx, NULL, NULL, NULL);
+    assert(!ioc->read_coroutine);
+    assert(!ioc->write_coroutine);
     ioc->ctx = ctx;
-    qio_channel_set_aio_fd_handlers(ioc);
 }
 
 void qio_channel_detach_aio_context(QIOChannel *ioc)