| Message ID | 20170615195110.17479-1-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 06/15/2017 02:51 PM, Paolo Bonzini wrote: > When attaching the NBD QIOChannel to an AioContext, the TLS channel should > be used, not the underlying socket channel. This is because, trivially, > the TLS channel will be the one that we read/write to and thus the one > that will get the qio_channel_yield() call. > > Fixes: ff82911cd3f69f028f2537825c9720ff78bc3f19 > Cc: qemu-stable@nongnu.org > Cc: Daniel P. Berrange <berrange@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > block/nbd-client.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/block/nbd-client.c b/block/nbd-client.c index 1e2952fdae..56eb0e2e16 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -352,14 +352,14 @@ int nbd_client_co_pdiscard(BlockDriverState *bs, int64_t offset, int count) void nbd_client_detach_aio_context(BlockDriverState *bs) { NBDClientSession *client = nbd_get_client_session(bs); - qio_channel_detach_aio_context(QIO_CHANNEL(client->sioc)); + qio_channel_detach_aio_context(QIO_CHANNEL(client->ioc)); } void nbd_client_attach_aio_context(BlockDriverState *bs, AioContext *new_context) { NBDClientSession *client = nbd_get_client_session(bs); - qio_channel_attach_aio_context(QIO_CHANNEL(client->sioc), new_context); + qio_channel_attach_aio_context(QIO_CHANNEL(client->ioc), new_context); aio_co_schedule(new_context, client->read_reply_co); }
When attaching the NBD QIOChannel to an AioContext, the TLS channel should be used, not the underlying socket channel. This is because, trivially, the TLS channel will be the one that we read/write to and thus the one that will get the qio_channel_yield() call. Fixes: ff82911cd3f69f028f2537825c9720ff78bc3f19 Cc: qemu-stable@nongnu.org Cc: Daniel P. Berrange <berrange@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- block/nbd-client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)