From 309faf75d981afc47f5890bbf65e5251c01249ef Mon Sep 17 00:00:00 2001

From: John Snow <jsnow@redhat.com>

Date: Wed, 27 Mar 2019 17:23:03 +0100

Subject: [PATCH 125/163] block/nbd-client: rename read_reply_co to

 connection_co

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

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

Patchwork-id: 85221

O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 50/55] block/nbd-client: rename read_reply_co to connection_co

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>

This coroutine will serve nbd reconnects, so, rename it to be something

more generic.

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

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

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

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

(cherry picked from commit bc5a03350c220698229e7d6929dd242d5d358345)

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

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

---

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

 block/nbd-client.h |  4 ++--

 2 files changed, 14 insertions(+), 14 deletions(-)

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

index 5f3a67f..1230850 100644

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

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

@@ -59,7 +59,7 @@ static void nbd_teardown_connection(BlockDriverState *bs)

     qio_channel_shutdown(client->ioc,

                          QIO_CHANNEL_SHUTDOWN_BOTH,

                          NULL);

-    BDRV_POLL_WHILE(bs, client->read_reply_co);

+    BDRV_POLL_WHILE(bs, client->connection_co);

     nbd_client_detach_aio_context(bs);

     object_unref(OBJECT(client->sioc));

@@ -68,7 +68,7 @@ static void nbd_teardown_connection(BlockDriverState *bs)

     client->ioc = NULL;

 }

-static coroutine_fn void nbd_read_reply_entry(void *opaque)

+static coroutine_fn void nbd_connection_entry(void *opaque)

 {

     NBDClientSession *s = opaque;

     uint64_t i;

@@ -100,14 +100,14 @@ static coroutine_fn void nbd_read_reply_entry(void *opaque)

         }

         /* We're woken up again by the request itself.  Note that there

-         * is no race between yielding and reentering read_reply_co.  This

+         * is no race between yielding and reentering connection_co.  This

          * is because:

          *

          * - if the request runs on the same AioContext, it is only

          *   entered after we yield

          *

          * - if the request runs on a different AioContext, reentering

-         *   read_reply_co happens through a bottom half, which can only

+         *   connection_co happens through a bottom half, which can only

          *   run after we yield.

          */

         aio_co_wake(s->requests[i].coroutine);

@@ -116,7 +116,7 @@ static coroutine_fn void nbd_read_reply_entry(void *opaque)

     s->quit = true;

     nbd_recv_coroutines_wake_all(s);

-    s->read_reply_co = NULL;

+    s->connection_co = NULL;

 }

 static int nbd_co_send_request(BlockDriverState *bs,

@@ -419,7 +419,7 @@ static coroutine_fn int nbd_co_do_receive_one_chunk(

     }

     *request_ret = 0;

-    /* Wait until we're woken up by nbd_read_reply_entry.  */

+    /* Wait until we're woken up by nbd_connection_entry.  */

     s->requests[i].receiving = true;

     qemu_coroutine_yield();

     s->requests[i].receiving = false;

@@ -494,7 +494,7 @@ static coroutine_fn int nbd_co_do_receive_one_chunk(

 }

 /* nbd_co_receive_one_chunk

- * Read reply, wake up read_reply_co and set s->quit if needed.

+ * Read reply, wake up connection_co and set s->quit if needed.

  * Return value is a fatal error code or normal nbd reply error code

  */

 static coroutine_fn int nbd_co_receive_one_chunk(

@@ -508,15 +508,15 @@ static coroutine_fn int nbd_co_receive_one_chunk(

     if (ret < 0) {

         s->quit = true;

     } else {

-        /* For assert at loop start in nbd_read_reply_entry */

+        /* For assert at loop start in nbd_connection_entry */

         if (reply) {

             *reply = s->reply;

         }

         s->reply.handle = 0;

     }

-    if (s->read_reply_co) {

-        aio_co_wake(s->read_reply_co);

+    if (s->connection_co) {

+        aio_co_wake(s->connection_co);

     }

     return ret;

@@ -969,7 +969,7 @@ void nbd_client_attach_aio_context(BlockDriverState *bs,

 {

     NBDClientSession *client = nbd_get_client_session(bs);

     qio_channel_attach_aio_context(QIO_CHANNEL(client->ioc), new_context);

-    aio_co_schedule(new_context, client->read_reply_co);

+    aio_co_schedule(new_context, client->connection_co);

 }

 void nbd_client_close(BlockDriverState *bs)

@@ -1074,7 +1074,7 @@ static int nbd_client_connect(BlockDriverState *bs,

     /* Now that we're connected, set the socket to be non-blocking and

      * kick the reply mechanism.  */

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

-    client->read_reply_co = qemu_coroutine_create(nbd_read_reply_entry, client);

+    client->connection_co = qemu_coroutine_create(nbd_connection_entry, client);

     nbd_client_attach_aio_context(bs, bdrv_get_aio_context(bs));

     logout("Established connection with NBD server\n");

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

index 2f047ba..d990207 100644

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

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

@@ -20,7 +20,7 @@

 typedef struct {

     Coroutine *coroutine;

     uint64_t offset;        /* original offset of the request */

-    bool receiving;         /* waiting for read_reply_co? */

+    bool receiving;         /* waiting for connection_co? */

 } NBDClientRequest;

 typedef struct NBDClientSession {

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

     CoMutex send_mutex;

     CoQueue free_sema;

-    Coroutine *read_reply_co;

+    Coroutine *connection_co;

     int in_flight;

     NBDClientRequest requests[MAX_NBD_REQUESTS];

-- 

1.8.3.1