yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
902636
From 50127f0ff9e13a15fd5bfeb2662e2404ff20f364 Mon Sep 17 00:00:00 2001
902636
From: Kevin Wolf <kwolf@redhat.com>
902636
Date: Mon, 8 Jun 2020 15:01:31 +0100
902636
Subject: [PATCH 03/17] block: Add flags to bdrv(_co)_truncate()
902636
902636
RH-Author: Kevin Wolf <kwolf@redhat.com>
902636
Message-id: <20200608150140.38218-3-kwolf@redhat.com>
902636
Patchwork-id: 97445
902636
O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 02/11] block: Add flags to bdrv(_co)_truncate()
902636
Bugzilla: 1780574
902636
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
902636
RH-Acked-by: Eric Blake <eblake@redhat.com>
902636
RH-Acked-by: Max Reitz <mreitz@redhat.com>
902636
902636
Now that block drivers can support flags for .bdrv_co_truncate, expose
902636
the parameter in the node level interfaces bdrv_co_truncate() and
902636
bdrv_truncate().
902636
902636
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
902636
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
902636
Reviewed-by: Alberto Garcia <berto@igalia.com>
902636
Reviewed-by: Max Reitz <mreitz@redhat.com>
902636
Message-Id: <20200424125448.63318-3-kwolf@redhat.com>
902636
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
902636
(cherry picked from commit 7b8e4857426f2e2de2441749996c6161b550bada)
902636
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 block/block-backend.c       |  2 +-
902636
 block/crypto.c              |  2 +-
902636
 block/io.c                  | 12 +++++++-----
902636
 block/parallels.c           |  6 +++---
902636
 block/qcow.c                |  4 ++--
902636
 block/qcow2-refcount.c      |  2 +-
902636
 block/qcow2.c               | 15 +++++++++------
902636
 block/raw-format.c          |  2 +-
902636
 block/vhdx-log.c            |  2 +-
902636
 block/vhdx.c                |  2 +-
902636
 block/vmdk.c                |  2 +-
902636
 include/block/block.h       |  5 +++--
902636
 tests/test-block-iothread.c |  6 +++---
902636
 13 files changed, 34 insertions(+), 28 deletions(-)
902636
902636
diff --git a/block/block-backend.c b/block/block-backend.c
902636
index 38ae413..8be2006 100644
902636
--- a/block/block-backend.c
902636
+++ b/block/block-backend.c
902636
@@ -2144,7 +2144,7 @@ int blk_truncate(BlockBackend *blk, int64_t offset, bool exact,
902636
         return -ENOMEDIUM;
902636
     }
902636
 
902636
-    return bdrv_truncate(blk->root, offset, exact, prealloc, errp);
902636
+    return bdrv_truncate(blk->root, offset, exact, prealloc, 0, errp);
902636
 }
902636
 
902636
 int blk_save_vmstate(BlockBackend *blk, const uint8_t *buf,
902636
diff --git a/block/crypto.c b/block/crypto.c
902636
index 6e4b726..fcb4a97 100644
902636
--- a/block/crypto.c
902636
+++ b/block/crypto.c
902636
@@ -313,7 +313,7 @@ block_crypto_co_truncate(BlockDriverState *bs, int64_t offset, bool exact,
902636
 
902636
     offset += payload_offset;
902636
 
902636
-    return bdrv_co_truncate(bs->file, offset, exact, prealloc, errp);
902636
+    return bdrv_co_truncate(bs->file, offset, exact, prealloc, 0, errp);
902636
 }
902636
 
902636
 static void block_crypto_close(BlockDriverState *bs)
902636
diff --git a/block/io.c b/block/io.c
902636
index 549e5a4..3235ce5 100644
902636
--- a/block/io.c
902636
+++ b/block/io.c
902636
@@ -3315,12 +3315,12 @@ static void bdrv_parent_cb_resize(BlockDriverState *bs)
902636
  * 'offset' bytes in length.
902636
  */
902636
 int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,
902636
-                                  PreallocMode prealloc, Error **errp)
902636
+                                  PreallocMode prealloc, BdrvRequestFlags flags,
902636
+                                  Error **errp)
902636
 {
902636
     BlockDriverState *bs = child->bs;
902636
     BlockDriver *drv = bs->drv;
902636
     BdrvTrackedRequest req;
902636
-    BdrvRequestFlags flags = 0;
902636
     int64_t old_size, new_bytes;
902636
     int ret;
902636
 
902636
@@ -3378,7 +3378,7 @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,
902636
         }
902636
         ret = drv->bdrv_co_truncate(bs, offset, exact, prealloc, flags, errp);
902636
     } else if (bs->file && drv->is_filter) {
902636
-        ret = bdrv_co_truncate(bs->file, offset, exact, prealloc, errp);
902636
+        ret = bdrv_co_truncate(bs->file, offset, exact, prealloc, flags, errp);
902636
     } else {
902636
         error_setg(errp, "Image format driver does not support resize");
902636
         ret = -ENOTSUP;
902636
@@ -3411,6 +3411,7 @@ typedef struct TruncateCo {
902636
     int64_t offset;
902636
     bool exact;
902636
     PreallocMode prealloc;
902636
+    BdrvRequestFlags flags;
902636
     Error **errp;
902636
     int ret;
902636
 } TruncateCo;
902636
@@ -3419,12 +3420,12 @@ static void coroutine_fn bdrv_truncate_co_entry(void *opaque)
902636
 {
902636
     TruncateCo *tco = opaque;
902636
     tco->ret = bdrv_co_truncate(tco->child, tco->offset, tco->exact,
902636
-                                tco->prealloc, tco->errp);
902636
+                                tco->prealloc, tco->flags, tco->errp);
902636
     aio_wait_kick();
902636
 }
902636
 
902636
 int bdrv_truncate(BdrvChild *child, int64_t offset, bool exact,
902636
-                  PreallocMode prealloc, Error **errp)
902636
+                  PreallocMode prealloc, BdrvRequestFlags flags, Error **errp)
902636
 {
902636
     Coroutine *co;
902636
     TruncateCo tco = {
902636
@@ -3432,6 +3433,7 @@ int bdrv_truncate(BdrvChild *child, int64_t offset, bool exact,
902636
         .offset     = offset,
902636
         .exact      = exact,
902636
         .prealloc   = prealloc,
902636
+        .flags      = flags,
902636
         .errp       = errp,
902636
         .ret        = NOT_DONE,
902636
     };
902636
diff --git a/block/parallels.c b/block/parallels.c
902636
index 6d4ed77..2be92cf 100644
902636
--- a/block/parallels.c
902636
+++ b/block/parallels.c
902636
@@ -203,7 +203,7 @@ static int64_t allocate_clusters(BlockDriverState *bs, int64_t sector_num,
902636
         } else {
902636
             ret = bdrv_truncate(bs->file,
902636
                                 (s->data_end + space) << BDRV_SECTOR_BITS,
902636
-                                false, PREALLOC_MODE_OFF, NULL);
902636
+                                false, PREALLOC_MODE_OFF, 0, NULL);
902636
         }
902636
         if (ret < 0) {
902636
             return ret;
902636
@@ -493,7 +493,7 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs,
902636
              * That means we have to pass exact=true.
902636
              */
902636
             ret = bdrv_truncate(bs->file, res->image_end_offset, true,
902636
-                                PREALLOC_MODE_OFF, &local_err);
902636
+                                PREALLOC_MODE_OFF, 0, &local_err);
902636
             if (ret < 0) {
902636
                 error_report_err(local_err);
902636
                 res->check_errors++;
902636
@@ -889,7 +889,7 @@ static void parallels_close(BlockDriverState *bs)
902636
 
902636
         /* errors are ignored, so we might as well pass exact=true */
902636
         bdrv_truncate(bs->file, s->data_end << BDRV_SECTOR_BITS, true,
902636
-                      PREALLOC_MODE_OFF, NULL);
902636
+                      PREALLOC_MODE_OFF, 0, NULL);
902636
     }
902636
 
902636
     g_free(s->bat_dirty_bmap);
902636
diff --git a/block/qcow.c b/block/qcow.c
902636
index 8973e4e..6b5f226 100644
902636
--- a/block/qcow.c
902636
+++ b/block/qcow.c
902636
@@ -480,7 +480,7 @@ static int get_cluster_offset(BlockDriverState *bs,
902636
                     return -E2BIG;
902636
                 }
902636
                 ret = bdrv_truncate(bs->file, cluster_offset + s->cluster_size,
902636
-                                    false, PREALLOC_MODE_OFF, NULL);
902636
+                                    false, PREALLOC_MODE_OFF, 0, NULL);
902636
                 if (ret < 0) {
902636
                     return ret;
902636
                 }
902636
@@ -1035,7 +1035,7 @@ static int qcow_make_empty(BlockDriverState *bs)
902636
             l1_length) < 0)
902636
         return -1;
902636
     ret = bdrv_truncate(bs->file, s->l1_table_offset + l1_length, false,
902636
-                        PREALLOC_MODE_OFF, NULL);
902636
+                        PREALLOC_MODE_OFF, 0, NULL);
902636
     if (ret < 0)
902636
         return ret;
902636
 
902636
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
902636
index f67ac6b..3a90d75 100644
902636
--- a/block/qcow2-refcount.c
902636
+++ b/block/qcow2-refcount.c
902636
@@ -2017,7 +2017,7 @@ static int check_refblocks(BlockDriverState *bs, BdrvCheckResult *res,
902636
                 }
902636
 
902636
                 ret = bdrv_truncate(bs->file, offset + s->cluster_size, false,
902636
-                                    PREALLOC_MODE_OFF, &local_err);
902636
+                                    PREALLOC_MODE_OFF, 0, &local_err);
902636
                 if (ret < 0) {
902636
                     error_report_err(local_err);
902636
                     goto resize_fail;
902636
diff --git a/block/qcow2.c b/block/qcow2.c
902636
index 977445e..c0fdcb9 100644
902636
--- a/block/qcow2.c
902636
+++ b/block/qcow2.c
902636
@@ -3082,7 +3082,7 @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
902636
             mode = PREALLOC_MODE_OFF;
902636
         }
902636
         ret = bdrv_co_truncate(s->data_file, host_offset + cur_bytes, false,
902636
-                               mode, errp);
902636
+                               mode, 0, errp);
902636
         if (ret < 0) {
902636
             return ret;
902636
         }
902636
@@ -4044,7 +4044,7 @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
902636
              * always fulfilled, so there is no need to pass it on.)
902636
              */
902636
             bdrv_co_truncate(bs->file, (last_cluster + 1) * s->cluster_size,
902636
-                             false, PREALLOC_MODE_OFF, &local_err);
902636
+                             false, PREALLOC_MODE_OFF, 0, &local_err);
902636
             if (local_err) {
902636
                 warn_reportf_err(local_err,
902636
                                  "Failed to truncate the tail of the image: ");
902636
@@ -4066,7 +4066,8 @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
902636
              * file should be resized to the exact target size, too,
902636
              * so we pass @exact here.
902636
              */
902636
-            ret = bdrv_co_truncate(s->data_file, offset, exact, prealloc, errp);
902636
+            ret = bdrv_co_truncate(s->data_file, offset, exact, prealloc, 0,
902636
+                                   errp);
902636
             if (ret < 0) {
902636
                 goto fail;
902636
             }
902636
@@ -4152,7 +4153,8 @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
902636
         new_file_size = allocation_start +
902636
                         nb_new_data_clusters * s->cluster_size;
902636
         /* Image file grows, so @exact does not matter */
902636
-        ret = bdrv_co_truncate(bs->file, new_file_size, false, prealloc, errp);
902636
+        ret = bdrv_co_truncate(bs->file, new_file_size, false, prealloc, 0,
902636
+                               errp);
902636
         if (ret < 0) {
902636
             error_prepend(errp, "Failed to resize underlying file: ");
902636
             qcow2_free_clusters(bs, allocation_start,
902636
@@ -4255,7 +4257,8 @@ qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
902636
         if (len < 0) {
902636
             return len;
902636
         }
902636
-        return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL);
902636
+        return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, 0,
902636
+                                NULL);
902636
     }
902636
 
902636
     if (offset_into_cluster(s, offset)) {
902636
@@ -4493,7 +4496,7 @@ static int make_completely_empty(BlockDriverState *bs)
902636
     }
902636
 
902636
     ret = bdrv_truncate(bs->file, (3 + l1_clusters) * s->cluster_size, false,
902636
-                        PREALLOC_MODE_OFF, &local_err);
902636
+                        PREALLOC_MODE_OFF, 0, &local_err);
902636
     if (ret < 0) {
902636
         error_report_err(local_err);
902636
         goto fail;
902636
diff --git a/block/raw-format.c b/block/raw-format.c
902636
index f994c4a..c3acf9a 100644
902636
--- a/block/raw-format.c
902636
+++ b/block/raw-format.c
902636
@@ -387,7 +387,7 @@ static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
902636
 
902636
     s->size = offset;
902636
     offset += s->offset;
902636
-    return bdrv_co_truncate(bs->file, offset, exact, prealloc, errp);
902636
+    return bdrv_co_truncate(bs->file, offset, exact, prealloc, 0, errp);
902636
 }
902636
 
902636
 static void raw_eject(BlockDriverState *bs, bool eject_flag)
902636
diff --git a/block/vhdx-log.c b/block/vhdx-log.c
902636
index 13a49c2..404fb5f 100644
902636
--- a/block/vhdx-log.c
902636
+++ b/block/vhdx-log.c
902636
@@ -558,7 +558,7 @@ static int vhdx_log_flush(BlockDriverState *bs, BDRVVHDXState *s,
902636
                     goto exit;
902636
                 }
902636
                 ret = bdrv_truncate(bs->file, new_file_size, false,
902636
-                                    PREALLOC_MODE_OFF, NULL);
902636
+                                    PREALLOC_MODE_OFF, 0, NULL);
902636
                 if (ret < 0) {
902636
                     goto exit;
902636
                 }
902636
diff --git a/block/vhdx.c b/block/vhdx.c
902636
index 33e57cd..5dfbb20 100644
902636
--- a/block/vhdx.c
902636
+++ b/block/vhdx.c
902636
@@ -1264,7 +1264,7 @@ static int vhdx_allocate_block(BlockDriverState *bs, BDRVVHDXState *s,
902636
     }
902636
 
902636
     return bdrv_truncate(bs->file, *new_offset + s->block_size, false,
902636
-                         PREALLOC_MODE_OFF, NULL);
902636
+                         PREALLOC_MODE_OFF, 0, NULL);
902636
 }
902636
 
902636
 /*
902636
diff --git a/block/vmdk.c b/block/vmdk.c
902636
index eb726f2..1bbf937 100644
902636
--- a/block/vmdk.c
902636
+++ b/block/vmdk.c
902636
@@ -2077,7 +2077,7 @@ vmdk_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
902636
             }
902636
             length = QEMU_ALIGN_UP(length, BDRV_SECTOR_SIZE);
902636
             ret = bdrv_truncate(s->extents[i].file, length, false,
902636
-                                PREALLOC_MODE_OFF, NULL);
902636
+                                PREALLOC_MODE_OFF, 0, NULL);
902636
             if (ret < 0) {
902636
                 return ret;
902636
             }
902636
diff --git a/include/block/block.h b/include/block/block.h
902636
index b2a3074..4913596 100644
902636
--- a/include/block/block.h
902636
+++ b/include/block/block.h
902636
@@ -348,9 +348,10 @@ BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs,
902636
 void bdrv_refresh_filename(BlockDriverState *bs);
902636
 
902636
 int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,
902636
-                                  PreallocMode prealloc, Error **errp);
902636
+                                  PreallocMode prealloc, BdrvRequestFlags flags,
902636
+                                  Error **errp);
902636
 int bdrv_truncate(BdrvChild *child, int64_t offset, bool exact,
902636
-                  PreallocMode prealloc, Error **errp);
902636
+                  PreallocMode prealloc, BdrvRequestFlags flags, Error **errp);
902636
 
902636
 int64_t bdrv_nb_sectors(BlockDriverState *bs);
902636
 int64_t bdrv_getlength(BlockDriverState *bs);
902636
diff --git a/tests/test-block-iothread.c b/tests/test-block-iothread.c
902636
index 2f3b763..71e9bce 100644
902636
--- a/tests/test-block-iothread.c
902636
+++ b/tests/test-block-iothread.c
902636
@@ -186,18 +186,18 @@ static void test_sync_op_truncate(BdrvChild *c)
902636
     int ret;
902636
 
902636
     /* Normal success path */
902636
-    ret = bdrv_truncate(c, 65536, false, PREALLOC_MODE_OFF, NULL);
902636
+    ret = bdrv_truncate(c, 65536, false, PREALLOC_MODE_OFF, 0, NULL);
902636
     g_assert_cmpint(ret, ==, 0);
902636
 
902636
     /* Early error: Negative offset */
902636
-    ret = bdrv_truncate(c, -2, false, PREALLOC_MODE_OFF, NULL);
902636
+    ret = bdrv_truncate(c, -2, false, PREALLOC_MODE_OFF, 0, NULL);
902636
     g_assert_cmpint(ret, ==, -EINVAL);
902636
 
902636
     /* Error: Read-only image */
902636
     c->bs->read_only = true;
902636
     c->bs->open_flags &= ~BDRV_O_RDWR;
902636
 
902636
-    ret = bdrv_truncate(c, 65536, false, PREALLOC_MODE_OFF, NULL);
902636
+    ret = bdrv_truncate(c, 65536, false, PREALLOC_MODE_OFF, 0, NULL);
902636
     g_assert_cmpint(ret, ==, -EACCES);
902636
 
902636
     c->bs->read_only = false;
902636
-- 
902636
1.8.3.1
902636