From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bq0QV-0003LX-D5 for qemu-devel@nongnu.org; Fri, 30 Sep 2016 12:12:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bq0QQ-0002Pl-5H for qemu-devel@nongnu.org; Fri, 30 Sep 2016 12:12:42 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:33911) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bq0QP-0002PN-Uk for qemu-devel@nongnu.org; Fri, 30 Sep 2016 12:12:38 -0400 Received: by mail-wm0-x241.google.com with SMTP id p197so2645113wmg.1 for ; Fri, 30 Sep 2016 09:12:37 -0700 (PDT) Sender: Paolo Bonzini References: <1475248620-534-1-git-send-email-berrange@redhat.com> <1475248620-534-3-git-send-email-berrange@redhat.com> From: Paolo Bonzini Message-ID: Date: Fri, 30 Sep 2016 18:12:35 +0200 MIME-Version: 1.0 In-Reply-To: <1475248620-534-3-git-send-email-berrange@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/6] nbd: set name for all I/O channels created List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" , qemu-devel@nongnu.org Cc: prashanth sunder , Stefan Hajnoczi On 30/09/2016 17:16, Daniel P. Berrange wrote: > Ensure that all I/O channels created for NBD are given names > to distinguish their respective roles. > > Signed-off-by: Daniel P. Berrange > --- > block/nbd.c | 1 + > blockdev-nbd.c | 3 +++ > nbd/client.c | 1 + > nbd/server.c | 1 + > 4 files changed, 6 insertions(+) > > diff --git a/block/nbd.c b/block/nbd.c > index 6bc06d6..1ec64ab 100644 > --- a/block/nbd.c > +++ b/block/nbd.c > @@ -248,6 +248,7 @@ static QIOChannelSocket *nbd_establish_connection(SocketAddress *saddr, > Error *local_err = NULL; > > sioc = qio_channel_socket_new(); > + qio_channel_set_name(QIO_CHANNEL(sioc), "nbd-client"); > > qio_channel_socket_connect_sync(sioc, > saddr, > diff --git a/blockdev-nbd.c b/blockdev-nbd.c > index ca41cc6..81bca17 100644 > --- a/blockdev-nbd.c > +++ b/blockdev-nbd.c > @@ -44,6 +44,7 @@ static gboolean nbd_accept(QIOChannel *ioc, GIOCondition condition, > return TRUE; > } > > + qio_channel_set_name(QIO_CHANNEL(cioc), "nbd-server"); > nbd_client_new(NULL, cioc, > nbd_server->tlscreds, NULL, > nbd_client_put); > @@ -111,6 +112,8 @@ void qmp_nbd_server_start(SocketAddress *addr, > nbd_server = g_new0(NBDServerData, 1); > nbd_server->watch = -1; > nbd_server->listen_ioc = qio_channel_socket_new(); > + qio_channel_set_name(QIO_CHANNEL(nbd_server->listen_ioc), > + "nbd-listener"); > if (qio_channel_socket_listen_sync( > nbd_server->listen_ioc, addr, errp) < 0) { > goto error; > diff --git a/nbd/client.c b/nbd/client.c > index a92f1e2..f6db836 100644 > --- a/nbd/client.c > +++ b/nbd/client.c > @@ -387,6 +387,7 @@ static QIOChannel *nbd_receive_starttls(QIOChannel *ioc, > if (!tioc) { > return NULL; > } > + qio_channel_set_name(QIO_CHANNEL(tioc), "nbd-client-tls"); > data.loop = g_main_loop_new(g_main_context_default(), FALSE); > TRACE("Starting TLS handshake"); > qio_channel_tls_handshake(tioc, > diff --git a/nbd/server.c b/nbd/server.c > index 472f584..36bcafc 100644 > --- a/nbd/server.c > +++ b/nbd/server.c > @@ -349,6 +349,7 @@ static QIOChannel *nbd_negotiate_handle_starttls(NBDClient *client, > return NULL; > } > > + qio_channel_set_name(QIO_CHANNEL(tioc), "nbd-server-tls"); > TRACE("Starting TLS handshake"); > data.loop = g_main_loop_new(g_main_context_default(), FALSE); > qio_channel_tls_handshake(tioc, > Acked-by: Paolo Bonzini