Blame SOURCES/kvm-qcow2-Remove-coroutine-trampoline-for-preallocate_co.patch

26ba25
From 8757520d53257c284c3042279488ec1d00e280c3 Mon Sep 17 00:00:00 2001
26ba25
From: Kevin Wolf <kwolf@redhat.com>
26ba25
Date: Thu, 12 Jul 2018 14:42:55 +0200
26ba25
Subject: [PATCH 210/268] qcow2: Remove coroutine trampoline for
26ba25
 preallocate_co()
26ba25
26ba25
RH-Author: Kevin Wolf <kwolf@redhat.com>
26ba25
Message-id: <20180712144258.17303-4-kwolf@redhat.com>
26ba25
Patchwork-id: 81329
26ba25
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 3/6] qcow2: Remove coroutine trampoline for preallocate_co()
26ba25
Bugzilla: 1595173
26ba25
RH-Acked-by: Max Reitz <mreitz@redhat.com>
26ba25
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
26ba25
RH-Acked-by: John Snow <jsnow@redhat.com>
26ba25
26ba25
All callers are coroutine_fns now, so we can just directly call
26ba25
preallocate_co().
26ba25
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
26ba25
(cherry picked from commit 47e86b868d57ffe13162ca44e5f6a51c15c4a769)
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 block/qcow2.c | 51 ++++++++-------------------------------------------
26ba25
 1 file changed, 8 insertions(+), 43 deletions(-)
26ba25
26ba25
diff --git a/block/qcow2.c b/block/qcow2.c
26ba25
index c5c6ae9..71fbfcd 100644
26ba25
--- a/block/qcow2.c
26ba25
+++ b/block/qcow2.c
26ba25
@@ -2517,15 +2517,6 @@ static int qcow2_set_up_encryption(BlockDriverState *bs,
26ba25
     return ret;
26ba25
 }
26ba25
 
26ba25
-
26ba25
-typedef struct PreallocCo {
26ba25
-    BlockDriverState *bs;
26ba25
-    uint64_t offset;
26ba25
-    uint64_t new_length;
26ba25
-
26ba25
-    int ret;
26ba25
-} PreallocCo;
26ba25
-
26ba25
 /**
26ba25
  * Preallocates metadata structures for data clusters between @offset (in the
26ba25
  * guest disk) and @new_length (which is thus generally the new guest disk
26ba25
@@ -2533,12 +2524,9 @@ typedef struct PreallocCo {
26ba25
  *
26ba25
  * Returns: 0 on success, -errno on failure.
26ba25
  */
26ba25
-static void coroutine_fn preallocate_co(void *opaque)
26ba25
+static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
26ba25
+                                       uint64_t new_length)
26ba25
 {
26ba25
-    PreallocCo *params = opaque;
26ba25
-    BlockDriverState *bs = params->bs;
26ba25
-    uint64_t offset = params->offset;
26ba25
-    uint64_t new_length = params->new_length;
26ba25
     uint64_t bytes;
26ba25
     uint64_t host_offset = 0;
26ba25
     unsigned int cur_bytes;
26ba25
@@ -2553,7 +2541,7 @@ static void coroutine_fn preallocate_co(void *opaque)
26ba25
         ret = qcow2_alloc_cluster_offset(bs, offset, &cur_bytes,
26ba25
                                          &host_offset, &meta);
26ba25
         if (ret < 0) {
26ba25
-            goto done;
26ba25
+            return ret;
26ba25
         }
26ba25
 
26ba25
         while (meta) {
26ba25
@@ -2563,7 +2551,7 @@ static void coroutine_fn preallocate_co(void *opaque)
26ba25
             if (ret < 0) {
26ba25
                 qcow2_free_any_clusters(bs, meta->alloc_offset,
26ba25
                                         meta->nb_clusters, QCOW2_DISCARD_NEVER);
26ba25
-                goto done;
26ba25
+                return ret;
26ba25
             }
26ba25
 
26ba25
             /* There are no dependent requests, but we need to remove our
26ba25
@@ -2590,34 +2578,11 @@ static void coroutine_fn preallocate_co(void *opaque)
26ba25
         ret = bdrv_pwrite(bs->file, (host_offset + cur_bytes) - 1,
26ba25
                           &data, 1);
26ba25
         if (ret < 0) {
26ba25
-            goto done;
26ba25
+            return ret;
26ba25
         }
26ba25
     }
26ba25
 
26ba25
-    ret = 0;
26ba25
-
26ba25
-done:
26ba25
-    params->ret = ret;
26ba25
-}
26ba25
-
26ba25
-static int preallocate(BlockDriverState *bs,
26ba25
-                       uint64_t offset, uint64_t new_length)
26ba25
-{
26ba25
-    PreallocCo params = {
26ba25
-        .bs         = bs,
26ba25
-        .offset     = offset,
26ba25
-        .new_length = new_length,
26ba25
-        .ret        = -EINPROGRESS,
26ba25
-    };
26ba25
-
26ba25
-    if (qemu_in_coroutine()) {
26ba25
-        preallocate_co(&params);
26ba25
-    } else {
26ba25
-        Coroutine *co = qemu_coroutine_create(preallocate_co, &params);
26ba25
-        bdrv_coroutine_enter(bs, co);
26ba25
-        BDRV_POLL_WHILE(bs, params.ret == -EINPROGRESS);
26ba25
-    }
26ba25
-    return params.ret;
26ba25
+    return 0;
26ba25
 }
26ba25
 
26ba25
 /* qcow2_refcount_metadata_size:
26ba25
@@ -3035,7 +3000,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
26ba25
     if (qcow2_opts->preallocation != PREALLOC_MODE_OFF) {
26ba25
         BDRVQcow2State *s = blk_bs(blk)->opaque;
26ba25
         qemu_co_mutex_lock(&s->lock);
26ba25
-        ret = preallocate(blk_bs(blk), 0, qcow2_opts->size);
26ba25
+        ret = preallocate_co(blk_bs(blk), 0, qcow2_opts->size);
26ba25
         qemu_co_mutex_unlock(&s->lock);
26ba25
 
26ba25
         if (ret < 0) {
26ba25
@@ -3544,7 +3509,7 @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
26ba25
         break;
26ba25
 
26ba25
     case PREALLOC_MODE_METADATA:
26ba25
-        ret = preallocate(bs, old_length, offset);
26ba25
+        ret = preallocate_co(bs, old_length, offset);
26ba25
         if (ret < 0) {
26ba25
             error_setg_errno(errp, -ret, "Preallocation failed");
26ba25
             goto fail;
26ba25
-- 
26ba25
1.8.3.1
26ba25