io: simplify qio_channel_attach_aio_context
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 26 May 2017 09:36:41 +0000 (11:36 +0200)
committerDaniel P. Berrange <berrange@redhat.com>
Fri, 26 May 2017 09:38:08 +0000 (10:38 +0100)
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>
io/channel.c

index cdf74540c1fa8e724f535f1211f44014688b4de1..1cfb8b33a22821595fe4e17846b1741f55647fb0 100644 (file)
@@ -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)