[Qemu-devel] [PULL v1 0/1] Merge I/O 2017/07/18

[Qemu-devel] [PULL v1 0/1] Merge I/O 2017/07/18

[Daniel P. Berrange]

The following changes since commit 9964e96dc9999cf7f7c936ee854a795415d19b60:

  Merge remote-tracking branch 'jasowang/tags/net-pull-request' into staging (2017-05-23 15:01:31 +0100)

are available in the git repository at:

  git://github.com/berrange/qemu tags/pull-qio-2017-07-18-1

for you to fetch changes up to 8f7168b34323ceec4d5faff797e7bcf1be57e6be:

  io: simplify qio_channel_attach_aio_context (2017-05-26 10:38:08 +0100)

----------------------------------------------------------------
Merge I/O 2017/07/18 v1

----------------------------------------------------------------
Paolo Bonzini (1):
  io: simplify qio_channel_attach_aio_context

 io/channel.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

-- 
2.13.0

[Qemu-devel] [PULL v1 1/1] io: simplify qio_channel_attach_aio_context

[Daniel P. Berrange]

From: Paolo Bonzini <pbonzini@redhat.com>

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 | 10 ++--------
 1 file 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)
-- 
2.13.0

Re: [Qemu-devel] [PULL v1 0/1] Merge I/O 2017/07/18

[Peter Maydell]

On 18 July 2017 at 11:32, Daniel P. Berrange <berrange@redhat.com> wrote:
> The following changes since commit 9964e96dc9999cf7f7c936ee854a795415d19b60:
>
>   Merge remote-tracking branch 'jasowang/tags/net-pull-request' into staging (2017-05-23 15:01:31 +0100)
>
> are available in the git repository at:
>
>   git://github.com/berrange/qemu tags/pull-qio-2017-07-18-1
>
> for you to fetch changes up to 8f7168b34323ceec4d5faff797e7bcf1be57e6be:
>
>   io: simplify qio_channel_attach_aio_context (2017-05-26 10:38:08 +0100)
>
> ----------------------------------------------------------------
> Merge I/O 2017/07/18 v1
>
> ----------------------------------------------------------------
> Paolo Bonzini (1):
>   io: simplify qio_channel_attach_aio_context
>
>  io/channel.c | 10 ++--------
>  1 file changed, 2 insertions(+), 8 deletions(-)

Applied, thanks.

-- PMM