From 6cc456c4c1e6557fdc7e138e8ef8171b71609222 Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Wed, 8 Apr 2020 17:29:15 +0100

Subject: [PATCH 4/6] block-backend: Reorder flush/pdiscard function

 definitions

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <20200408172917.18712-5-kwolf@redhat.com>

Patchwork-id: 94598

O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 4/6] block-backend: Reorder flush/pdiscard function definitions

Bugzilla: 1817621

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

RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>

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

Move all variants of the flush/pdiscard functions to a single place and

put the blk_co_*() version first because it is called by all other

variants (and will become static in the next patch).

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

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

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

Message-Id: <20200407121259.21350-2-kwolf@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

(cherry picked from commit 564806c529d4e0acad209b1e5b864a8886092f1f)

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 block/block-backend.c | 92 +++++++++++++++++++++++++--------------------------

 1 file changed, 46 insertions(+), 46 deletions(-)

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

index 8b8f2a8..17b2e87 100644

--- a/block/block-backend.c

+++ b/block/block-backend.c

@@ -1488,38 +1488,6 @@ BlockAIOCB *blk_aio_pwritev(BlockBackend *blk, int64_t offset,

                         blk_aio_write_entry, flags, cb, opaque);

 }

-static void blk_aio_flush_entry(void *opaque)

-{

-    BlkAioEmAIOCB *acb = opaque;

-    BlkRwCo *rwco = &acb->rwco;

-

-    rwco->ret = blk_co_flush(rwco->blk);

-    blk_aio_complete(acb);

-}

-

-BlockAIOCB *blk_aio_flush(BlockBackend *blk,

-                          BlockCompletionFunc *cb, void *opaque)

-{

-    return blk_aio_prwv(blk, 0, 0, NULL, blk_aio_flush_entry, 0, cb, opaque);

-}

-

-static void blk_aio_pdiscard_entry(void *opaque)

-{

-    BlkAioEmAIOCB *acb = opaque;

-    BlkRwCo *rwco = &acb->rwco;

-

-    rwco->ret = blk_co_pdiscard(rwco->blk, rwco->offset, acb->bytes);

-    blk_aio_complete(acb);

-}

-

-BlockAIOCB *blk_aio_pdiscard(BlockBackend *blk,

-                             int64_t offset, int bytes,

-                             BlockCompletionFunc *cb, void *opaque)

-{

-    return blk_aio_prwv(blk, offset, bytes, NULL, blk_aio_pdiscard_entry, 0,

-                        cb, opaque);

-}

-

 void blk_aio_cancel(BlockAIOCB *acb)

 {

     bdrv_aio_cancel(acb);

@@ -1586,6 +1554,37 @@ int blk_co_pdiscard(BlockBackend *blk, int64_t offset, int bytes)

     return bdrv_co_pdiscard(blk->root, offset, bytes);

 }

+static void blk_aio_pdiscard_entry(void *opaque)

+{

+    BlkAioEmAIOCB *acb = opaque;

+    BlkRwCo *rwco = &acb->rwco;

+

+    rwco->ret = blk_co_pdiscard(rwco->blk, rwco->offset, acb->bytes);

+    blk_aio_complete(acb);

+}

+

+BlockAIOCB *blk_aio_pdiscard(BlockBackend *blk,

+                             int64_t offset, int bytes,

+                             BlockCompletionFunc *cb, void *opaque)

+{

+    return blk_aio_prwv(blk, offset, bytes, NULL, blk_aio_pdiscard_entry, 0,

+                        cb, opaque);

+}

+

+static void blk_pdiscard_entry(void *opaque)

+{

+    BlkRwCo *rwco = opaque;

+    QEMUIOVector *qiov = rwco->iobuf;

+

+    rwco->ret = blk_co_pdiscard(rwco->blk, rwco->offset, qiov->size);

+    aio_wait_kick();

+}

+

+int blk_pdiscard(BlockBackend *blk, int64_t offset, int bytes)

+{

+    return blk_prw(blk, offset, NULL, bytes, blk_pdiscard_entry, 0);

+}

+

 int blk_co_flush(BlockBackend *blk)

 {

     blk_wait_while_drained(blk);

@@ -1597,6 +1596,21 @@ int blk_co_flush(BlockBackend *blk)

     return bdrv_co_flush(blk_bs(blk));

 }

+static void blk_aio_flush_entry(void *opaque)

+{

+    BlkAioEmAIOCB *acb = opaque;

+    BlkRwCo *rwco = &acb->rwco;

+

+    rwco->ret = blk_co_flush(rwco->blk);

+    blk_aio_complete(acb);

+}

+

+BlockAIOCB *blk_aio_flush(BlockBackend *blk,

+                          BlockCompletionFunc *cb, void *opaque)

+{

+    return blk_aio_prwv(blk, 0, 0, NULL, blk_aio_flush_entry, 0, cb, opaque);

+}

+

 static void blk_flush_entry(void *opaque)

 {

     BlkRwCo *rwco = opaque;

@@ -2083,20 +2097,6 @@ int blk_truncate(BlockBackend *blk, int64_t offset, bool exact,

     return bdrv_truncate(blk->root, offset, exact, prealloc, errp);

 }

-static void blk_pdiscard_entry(void *opaque)

-{

-    BlkRwCo *rwco = opaque;

-    QEMUIOVector *qiov = rwco->iobuf;

-

-    rwco->ret = blk_co_pdiscard(rwco->blk, rwco->offset, qiov->size);

-    aio_wait_kick();

-}

-

-int blk_pdiscard(BlockBackend *blk, int64_t offset, int bytes)

-{

-    return blk_prw(blk, offset, NULL, bytes, blk_pdiscard_entry, 0);

-}

-

 int blk_save_vmstate(BlockBackend *blk, const uint8_t *buf,

                      int64_t pos, int size)

 {

-- 

1.8.3.1