From 17d9cdafd0e6859af0b44b26870f8d61bc6f7c2d Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Thu, 12 Jul 2018 14:42:55 +0200

Subject: [PATCH 36/89] qcow2: Remove coroutine trampoline for preallocate_co()

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

Message-id: <20180712144258.17303-4-kwolf@redhat.com>

Patchwork-id: 81329

O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 3/6] qcow2: Remove coroutine trampoline for preallocate_co()

Bugzilla: 1595173

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

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

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

All callers are coroutine_fns now, so we can just directly call

preallocate_co().

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

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

(cherry picked from commit 47e86b868d57ffe13162ca44e5f6a51c15c4a769)

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

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

---

 block/qcow2.c | 51 ++++++++-------------------------------------------

 1 file changed, 8 insertions(+), 43 deletions(-)

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

index c5c6ae9..71fbfcd 100644

--- a/block/qcow2.c

+++ b/block/qcow2.c

@@ -2517,15 +2517,6 @@ static int qcow2_set_up_encryption(BlockDriverState *bs,

     return ret;

 }

-

-typedef struct PreallocCo {

-    BlockDriverState *bs;

-    uint64_t offset;

-    uint64_t new_length;

-

-    int ret;

-} PreallocCo;

-

 /**

  * Preallocates metadata structures for data clusters between @offset (in the

  * guest disk) and @new_length (which is thus generally the new guest disk

@@ -2533,12 +2524,9 @@ typedef struct PreallocCo {

  *

  * Returns: 0 on success, -errno on failure.

  */

-static void coroutine_fn preallocate_co(void *opaque)

+static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,

+                                       uint64_t new_length)

 {

-    PreallocCo *params = opaque;

-    BlockDriverState *bs = params->bs;

-    uint64_t offset = params->offset;

-    uint64_t new_length = params->new_length;

     uint64_t bytes;

     uint64_t host_offset = 0;

     unsigned int cur_bytes;

@@ -2553,7 +2541,7 @@ static void coroutine_fn preallocate_co(void *opaque)

         ret = qcow2_alloc_cluster_offset(bs, offset, &cur_bytes,

                                          &host_offset, &meta);

         if (ret < 0) {

-            goto done;

+            return ret;

         }

         while (meta) {

@@ -2563,7 +2551,7 @@ static void coroutine_fn preallocate_co(void *opaque)

             if (ret < 0) {

                 qcow2_free_any_clusters(bs, meta->alloc_offset,

                                         meta->nb_clusters, QCOW2_DISCARD_NEVER);

-                goto done;

+                return ret;

             }

             /* There are no dependent requests, but we need to remove our

@@ -2590,34 +2578,11 @@ static void coroutine_fn preallocate_co(void *opaque)

         ret = bdrv_pwrite(bs->file, (host_offset + cur_bytes) - 1,

                           &data, 1);

         if (ret < 0) {

-            goto done;

+            return ret;

         }

     }

-    ret = 0;

-

-done:

-    params->ret = ret;

-}

-

-static int preallocate(BlockDriverState *bs,

-                       uint64_t offset, uint64_t new_length)

-{

-    PreallocCo params = {

-        .bs         = bs,

-        .offset     = offset,

-        .new_length = new_length,

-        .ret        = -EINPROGRESS,

-    };

-

-    if (qemu_in_coroutine()) {

-        preallocate_co(&params);

-    } else {

-        Coroutine *co = qemu_coroutine_create(preallocate_co, &params);

-        bdrv_coroutine_enter(bs, co);

-        BDRV_POLL_WHILE(bs, params.ret == -EINPROGRESS);

-    }

-    return params.ret;

+    return 0;

 }

 /* qcow2_refcount_metadata_size:

@@ -3035,7 +3000,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)

     if (qcow2_opts->preallocation != PREALLOC_MODE_OFF) {

         BDRVQcow2State *s = blk_bs(blk)->opaque;

         qemu_co_mutex_lock(&s->lock);

-        ret = preallocate(blk_bs(blk), 0, qcow2_opts->size);

+        ret = preallocate_co(blk_bs(blk), 0, qcow2_opts->size);

         qemu_co_mutex_unlock(&s->lock);

         if (ret < 0) {

@@ -3544,7 +3509,7 @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,

         break;

     case PREALLOC_MODE_METADATA:

-        ret = preallocate(bs, old_length, offset);

+        ret = preallocate_co(bs, old_length, offset);

         if (ret < 0) {

             error_setg_errno(errp, -ret, "Preallocation failed");

             goto fail;

-- 

1.8.3.1