From: Paolo Bonzini Date: Fri, 26 May 2017 09:36:41 +0000 (+0200) Subject: io: simplify qio_channel_attach_aio_context X-Git-Tag: v2.10.0-rc0~39^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f7168b34323ceec4d5faff797e7bcf1be57e6be;p=thirdparty%2Fqemu.git 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 Signed-off-by: Daniel P. Berrange --- diff --git a/io/channel.c b/io/channel.c index cdf74540c1f..1cfb8b33a22 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)