From 5185df6533f3e1f3c428e6d7b11a1fe372d0357b Mon Sep 17 00:00:00 2001

From: Jeffrey Cody <jcody@redhat.com>

Date: Thu, 30 Nov 2017 22:49:06 +0100

Subject: [PATCH 02/21] block: rename bdrv_co_drain to bdrv_co_drain_begin

RH-Author: Jeffrey Cody <jcody@redhat.com>

Message-id: <ec3f5f7be56c7d67bb8e8230d5ef27824ea2bf1f.1511985875.git.jcody@redhat.com>

Patchwork-id: 78039

O-Subject: [RHV7.5 qemu-kvm-rhev PATCH 02/11] block: rename bdrv_co_drain to bdrv_co_drain_begin

Bugzilla: 1506531

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

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

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

From: Manos Pitsidianakis <el13635@mail.ntua.gr>

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

Reviewed-by: Fam Zheng <famz@redhat.com>

Signed-off-by: Manos Pitsidianakis <el13635@mail.ntua.gr>

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

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

(cherry picked from commit f8ea8dacf0de636e2c0f13b90c0d75db97dc9b44)

Signed-off-by: Jeff Cody <jcody@redhat.com>

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

---

 block/io.c                | 4 ++--

 block/qed.c               | 6 +++---

 include/block/block_int.h | 4 ++--

 3 files changed, 7 insertions(+), 7 deletions(-)

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

index 93fb802..3a717bc 100644

--- a/block/io.c

+++ b/block/io.c

@@ -162,7 +162,7 @@ static void coroutine_fn bdrv_drain_invoke_entry(void *opaque)

     BlockDriverState *bs = data->bs;

     if (data->begin) {

-        bs->drv->bdrv_co_drain(bs);

+        bs->drv->bdrv_co_drain_begin(bs);

     } else {

         bs->drv->bdrv_co_drain_end(bs);

     }

@@ -176,7 +176,7 @@ static void bdrv_drain_invoke(BlockDriverState *bs, bool begin)

 {

     BdrvCoDrainData data = { .bs = bs, .done = false, .begin = begin};

-    if (!bs->drv || (begin && !bs->drv->bdrv_co_drain) ||

+    if (!bs->drv || (begin && !bs->drv->bdrv_co_drain_begin) ||

             (!begin && !bs->drv->bdrv_co_drain_end)) {

         return;

     }

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

index dc54bf4..62d12db 100644

--- a/block/qed.c

+++ b/block/qed.c

@@ -265,7 +265,7 @@ static bool qed_plug_allocating_write_reqs(BDRVQEDState *s)

     assert(!s->allocating_write_reqs_plugged);

     if (s->allocating_acb != NULL) {

         /* Another allocating write came concurrently.  This cannot happen

-         * from bdrv_qed_co_drain, but it can happen when the timer runs.

+         * from bdrv_qed_co_drain_begin, but it can happen when the timer runs.

          */

         qemu_co_mutex_unlock(&s->table_lock);

         return false;

@@ -358,7 +358,7 @@ static void bdrv_qed_attach_aio_context(BlockDriverState *bs,

     }

 }

-static void coroutine_fn bdrv_qed_co_drain(BlockDriverState *bs)

+static void coroutine_fn bdrv_qed_co_drain_begin(BlockDriverState *bs)

 {

     BDRVQEDState *s = bs->opaque;

@@ -1608,7 +1608,7 @@ static BlockDriver bdrv_qed = {

     .bdrv_check               = bdrv_qed_check,

     .bdrv_detach_aio_context  = bdrv_qed_detach_aio_context,

     .bdrv_attach_aio_context  = bdrv_qed_attach_aio_context,

-    .bdrv_co_drain            = bdrv_qed_co_drain,

+    .bdrv_co_drain_begin      = bdrv_qed_co_drain_begin,

 };

 static void bdrv_qed_init(void)

diff --git a/include/block/block_int.h b/include/block/block_int.h

index 98d02ba..e02d540 100644

--- a/include/block/block_int.h

+++ b/include/block/block_int.h

@@ -320,7 +320,7 @@ struct BlockDriver {

     int (*bdrv_probe_geometry)(BlockDriverState *bs, HDGeometry *geo);

     /**

-     * bdrv_co_drain is called if implemented in the beginning of a

+     * bdrv_co_drain_begin is called if implemented in the beginning of a

      * drain operation to drain and stop any internal sources of requests in

      * the driver.

      * bdrv_co_drain_end is called if implemented at the end of the drain.

@@ -329,7 +329,7 @@ struct BlockDriver {

      * requests, or toggle an internal state. After the end of the drain new

      * requests will continue normally.

      */

-    void coroutine_fn (*bdrv_co_drain)(BlockDriverState *bs);

+    void coroutine_fn (*bdrv_co_drain_begin)(BlockDriverState *bs);

     void coroutine_fn (*bdrv_co_drain_end)(BlockDriverState *bs);

     void (*bdrv_add_child)(BlockDriverState *parent, BlockDriverState *child,

-- 

1.8.3.1