From 44a47acaccb8455be42cb302885af0934c3360db Mon Sep 17 00:00:00 2001

From: John Snow <jsnow@redhat.com>

Date: Wed, 27 Mar 2019 17:22:59 +0100

Subject: [PATCH 121/163] block/nbd: move connection code from block/nbd to

 block/nbd-client

RH-Author: John Snow <jsnow@redhat.com>

Message-id: <20190327172308.31077-47-jsnow@redhat.com>

Patchwork-id: 85218

O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 46/55] block/nbd: move connection code from block/nbd to block/nbd-client

Bugzilla: 1691009

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Keep all connection code in one file, to be able to implement reconnect

in further patches.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Message-Id: <20190201130138.94525-3-vsementsov@virtuozzo.com>

Reviewed-by: Eric Blake <eblake@redhat.com>

[eblake: format tweak]

Signed-off-by: Eric Blake <eblake@redhat.com>

(cherry picked from commit d42f78e9400c51f1ae30dadd52995e4d6b052d89)

Signed-off-by: John Snow <jsnow@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 block/nbd-client.c | 38 ++++++++++++++++++++++++++++++++++++--

 block/nbd-client.h |  2 +-

 block/nbd.c        | 40 ++--------------------------------------

 3 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/block/nbd-client.c b/block/nbd-client.c

index f5b9aaa..d86c412 100644

--- a/block/nbd-client.c

+++ b/block/nbd-client.c

@@ -990,8 +990,29 @@ void nbd_client_close(BlockDriverState *bs)

     nbd_teardown_connection(bs);

 }

+static QIOChannelSocket *nbd_establish_connection(SocketAddress *saddr,

+                                                  Error **errp)

+{

+    QIOChannelSocket *sioc;

+    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, &local_err);

+    if (local_err) {

+        object_unref(OBJECT(sioc));

+        error_propagate(errp, local_err);

+        return NULL;

+    }

+

+    qio_channel_set_delay(QIO_CHANNEL(sioc), false);

+

+    return sioc;

+}

+

 int nbd_client_init(BlockDriverState *bs,

-                    QIOChannelSocket *sioc,

+                    SocketAddress *saddr,

                     const char *export,

                     QCryptoTLSCreds *tlscreds,

                     const char *hostname,

@@ -1001,6 +1022,16 @@ int nbd_client_init(BlockDriverState *bs,

     NBDClientSession *client = nbd_get_client_session(bs);

     int ret;

+    /*

+     * establish TCP connection, return error if it fails

+     * TODO: Configurable retry-until-timeout behaviour.

+     */

+    QIOChannelSocket *sioc = nbd_establish_connection(saddr, errp);

+

+    if (!sioc) {

+        return -ECONNREFUSED;

+    }

+

     /* NBD handshake */

     logout("session init %s\n", export);

     qio_channel_set_blocking(QIO_CHANNEL(sioc), true, NULL);

@@ -1016,6 +1047,7 @@ int nbd_client_init(BlockDriverState *bs,

     g_free(client->info.name);

     if (ret < 0) {

         logout("Failed to negotiate with the NBD server\n");

+        object_unref(OBJECT(sioc));

         return ret;

     }

     if (x_dirty_bitmap && !client->info.base_allocation) {

@@ -1041,7 +1073,6 @@ int nbd_client_init(BlockDriverState *bs,

     qemu_co_mutex_init(&client->send_mutex);

     qemu_co_queue_init(&client->free_sema);

     client->sioc = sioc;

-    object_ref(OBJECT(client->sioc));

     if (!client->ioc) {

         client->ioc = QIO_CHANNEL(sioc);

@@ -1067,6 +1098,9 @@ int nbd_client_init(BlockDriverState *bs,

         NBDRequest request = { .type = NBD_CMD_DISC };

         nbd_send_request(client->ioc ?: QIO_CHANNEL(sioc), &request);

+

+        object_unref(OBJECT(sioc));

+

         return ret;

     }

 }

diff --git a/block/nbd-client.h b/block/nbd-client.h

index cfc9055..2f047ba 100644

--- a/block/nbd-client.h

+++ b/block/nbd-client.h

@@ -41,7 +41,7 @@ typedef struct NBDClientSession {

 NBDClientSession *nbd_get_client_session(BlockDriverState *bs);

 int nbd_client_init(BlockDriverState *bs,

-                    QIOChannelSocket *sock,

+                    SocketAddress *saddr,

                     const char *export_name,

                     QCryptoTLSCreds *tlscreds,

                     const char *hostname,

diff --git a/block/nbd.c b/block/nbd.c

index f29c10f..838a8fe 100644

--- a/block/nbd.c

+++ b/block/nbd.c

@@ -295,30 +295,6 @@ NBDClientSession *nbd_get_client_session(BlockDriverState *bs)

     return &s->client;

 }

-static QIOChannelSocket *nbd_establish_connection(SocketAddress *saddr,

-                                                  Error **errp)

-{

-    QIOChannelSocket *sioc;

-    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,

-                                    &local_err);

-    if (local_err) {

-        object_unref(OBJECT(sioc));

-        error_propagate(errp, local_err);

-        return NULL;

-    }

-

-    qio_channel_set_delay(QIO_CHANNEL(sioc), false);

-

-    return sioc;

-}

-

-

 static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, Error **errp)

 {

     Object *obj;

@@ -394,7 +370,6 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags,

     BDRVNBDState *s = bs->opaque;

     QemuOpts *opts = NULL;

     Error *local_err = NULL;

-    QIOChannelSocket *sioc = NULL;

     QCryptoTLSCreds *tlscreds = NULL;

     const char *hostname = NULL;

     int ret = -EINVAL;

@@ -434,22 +409,11 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags,

         hostname = s->saddr->u.inet.host;

     }

-    /* establish TCP connection, return error if it fails

-     * TODO: Configurable retry-until-timeout behaviour.

-     */

-    sioc = nbd_establish_connection(s->saddr, errp);

-    if (!sioc) {

-        ret = -ECONNREFUSED;

-        goto error;

-    }

-

     /* NBD handshake */

-    ret = nbd_client_init(bs, sioc, s->export, tlscreds, hostname,

+    ret = nbd_client_init(bs, s->saddr, s->export, tlscreds, hostname,

                           qemu_opt_get(opts, "x-dirty-bitmap"), errp);

+

  error:

-    if (sioc) {

-        object_unref(OBJECT(sioc));

-    }

     if (tlscreds) {

         object_unref(OBJECT(tlscreds));

     }

-- 

1.8.3.1