diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2016-09-30 11:57:14 +0100 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2016-10-27 09:13:10 +0200 |
| commit | 0d73f7253e4837603dbcbb7af0706d4d57124b5e (patch) | |
| tree | 48656dc13c998dd3d3c4abf81b83307efd206758 | |
| parent | 20f4aa265ec8442be66f00ee3986a92018b44b7b (diff) | |
| download | migration-0d73f7253e4837603dbcbb7af0706d4d57124b5e.tar.gz | |
nbd: set name for all I/O channels created
Ensure that all I/O channels created for NBD are given names
to distinguish their respective roles.
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
| -rw-r--r-- | block/nbd.c | 1 | ||||
| -rw-r--r-- | blockdev-nbd.c | 3 | ||||
| -rw-r--r-- | nbd/client.c | 1 | ||||
| -rw-r--r-- | nbd/server.c | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/block/nbd.c b/block/nbd.c index 6bc06d61986..1ec64ab95e0 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 ca41cc6fdd9..81bca1760f5 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 a92f1e22753..f6db8369b3e 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 472f584c323..36bcafcd506 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, |