From 07a93e74efa4861f54dd3d4bec01885f7af2fee3 Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Mon, 8 Jun 2020 17:01:32 +0200

Subject: [PATCH 04/17] block-backend: Add flags to blk_truncate()

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

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

Patchwork-id: 97450

O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 03/11] block-backend: Add flags to blk_truncate()

Bugzilla: 1780574

RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>

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

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

Now that node level interface bdrv_truncate() supports passing request

flags to the block driver, expose this on the BlockBackend level, too.

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

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

Reviewed-by: Alberto Garcia <berto@igalia.com>

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

Message-Id: <20200424125448.63318-4-kwolf@redhat.com>

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

(cherry picked from commit 8c6242b6f383e43fd11d2c50f8bcdd2bba1100fc)

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

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

---

 block.c                        | 3 ++-

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

 block/commit.c                 | 4 ++--

 block/crypto.c                 | 2 +-

 block/mirror.c                 | 2 +-

 block/qcow2.c                  | 4 ++--

 block/qed.c                    | 2 +-

 block/vdi.c                    | 2 +-

 block/vhdx.c                   | 4 ++--

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

 block/vpc.c                    | 2 +-

 blockdev.c                     | 2 +-

 include/sysemu/block-backend.h | 2 +-

 qemu-img.c                     | 2 +-

 qemu-io-cmds.c                 | 2 +-

 15 files changed, 22 insertions(+), 21 deletions(-)

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

index d6a05da..12c8941 100644

--- a/block.c

+++ b/block.c

@@ -547,7 +547,8 @@ static int64_t create_file_fallback_truncate(BlockBackend *blk,

     int64_t size;

     int ret;

-    ret = blk_truncate(blk, minimum_size, false, PREALLOC_MODE_OFF, &local_err);

+    ret = blk_truncate(blk, minimum_size, false, PREALLOC_MODE_OFF, 0,

+                       &local_err);

     if (ret < 0 && ret != -ENOTSUP) {

         error_propagate(errp, local_err);

         return ret;

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

index 8be2006..17ed6d8 100644

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

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

@@ -2137,14 +2137,14 @@ int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *buf,

 }

 int blk_truncate(BlockBackend *blk, int64_t offset, bool exact,

-                 PreallocMode prealloc, Error **errp)

+                 PreallocMode prealloc, BdrvRequestFlags flags, Error **errp)

 {

     if (!blk_is_available(blk)) {

         error_setg(errp, "No medium inserted");

         return -ENOMEDIUM;

     }

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

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

 }

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

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

index 23c90b3..075ebf8 100644

--- a/block/commit.c

+++ b/block/commit.c

@@ -155,7 +155,7 @@ static int coroutine_fn commit_run(Job *job, Error **errp)

     }

     if (base_len < len) {

-        ret = blk_truncate(s->base, len, false, PREALLOC_MODE_OFF, NULL);

+        ret = blk_truncate(s->base, len, false, PREALLOC_MODE_OFF, 0, NULL);

         if (ret) {

             goto out;

         }

@@ -471,7 +471,7 @@ int bdrv_commit(BlockDriverState *bs)

      * grow the backing file image if possible.  If not possible,

      * we must return an error */

     if (length > backing_length) {

-        ret = blk_truncate(backing, length, false, PREALLOC_MODE_OFF,

+        ret = blk_truncate(backing, length, false, PREALLOC_MODE_OFF, 0,

                            &local_err);

         if (ret < 0) {

             error_report_err(local_err);

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

index fcb4a97..83a8fc0 100644

--- a/block/crypto.c

+++ b/block/crypto.c

@@ -115,7 +115,7 @@ static ssize_t block_crypto_init_func(QCryptoBlock *block,

      * which will be used by the crypto header

      */

     return blk_truncate(data->blk, data->size + headerlen, false,

-                        data->prealloc, errp);

+                        data->prealloc, 0, errp);

 }

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

index 0d32fca..c8028cd 100644

--- a/block/mirror.c

+++ b/block/mirror.c

@@ -886,7 +886,7 @@ static int coroutine_fn mirror_run(Job *job, Error **errp)

     if (s->base == blk_bs(s->target)) {

         if (s->bdev_length > target_length) {

             ret = blk_truncate(s->target, s->bdev_length, false,

-                               PREALLOC_MODE_OFF, NULL);

+                               PREALLOC_MODE_OFF, 0, NULL);

             if (ret < 0) {

                 goto immediate_exit;

             }

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

index c0fdcb9..86aa74a 100644

--- a/block/qcow2.c

+++ b/block/qcow2.c

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

     /* Okay, now that we have a valid image, let's give it the right size */

     ret = blk_truncate(blk, qcow2_opts->size, false, qcow2_opts->preallocation,

-                       errp);

+                       0, errp);

     if (ret < 0) {

         error_prepend(errp, "Could not resize image: ");

         goto out;

@@ -5347,7 +5347,7 @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

          * Amending image options should ensure that the image has

          * exactly the given new values, so pass exact=true here.

          */

-        ret = blk_truncate(blk, new_size, true, PREALLOC_MODE_OFF, errp);

+        ret = blk_truncate(blk, new_size, true, PREALLOC_MODE_OFF, 0, errp);

         blk_unref(blk);

         if (ret < 0) {

             return ret;

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

index fb6100b..b0fdb8f 100644

--- a/block/qed.c

+++ b/block/qed.c

@@ -677,7 +677,7 @@ static int coroutine_fn bdrv_qed_co_create(BlockdevCreateOptions *opts,

      * The QED format associates file length with allocation status,

      * so a new file (which is empty) must have a length of 0.

      */

-    ret = blk_truncate(blk, 0, true, PREALLOC_MODE_OFF, errp);

+    ret = blk_truncate(blk, 0, true, PREALLOC_MODE_OFF, 0, errp);

     if (ret < 0) {

         goto out;

     }

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

index e1a11f2..0c7835a 100644

--- a/block/vdi.c

+++ b/block/vdi.c

@@ -875,7 +875,7 @@ static int coroutine_fn vdi_co_do_create(BlockdevCreateOptions *create_options,

     if (image_type == VDI_TYPE_STATIC) {

         ret = blk_truncate(blk, offset + blocks * block_size, false,

-                           PREALLOC_MODE_OFF, errp);

+                           PREALLOC_MODE_OFF, 0, errp);

         if (ret < 0) {

             error_prepend(errp, "Failed to statically allocate file");

             goto exit;

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

index 5dfbb20..21497f7 100644

--- a/block/vhdx.c

+++ b/block/vhdx.c

@@ -1703,13 +1703,13 @@ static int vhdx_create_bat(BlockBackend *blk, BDRVVHDXState *s,

         /* All zeroes, so we can just extend the file - the end of the BAT

          * is the furthest thing we have written yet */

         ret = blk_truncate(blk, data_file_offset, false, PREALLOC_MODE_OFF,

-                           errp);

+                           0, errp);

         if (ret < 0) {

             goto exit;

         }

     } else if (type == VHDX_TYPE_FIXED) {

         ret = blk_truncate(blk, data_file_offset + image_size, false,

-                           PREALLOC_MODE_OFF, errp);

+                           PREALLOC_MODE_OFF, 0, errp);

         if (ret < 0) {

             goto exit;

         }

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

index 1bbf937..1bd3991 100644

--- a/block/vmdk.c

+++ b/block/vmdk.c

@@ -2118,7 +2118,7 @@ static int vmdk_init_extent(BlockBackend *blk,

     int gd_buf_size;

     if (flat) {

-        ret = blk_truncate(blk, filesize, false, PREALLOC_MODE_OFF, errp);

+        ret = blk_truncate(blk, filesize, false, PREALLOC_MODE_OFF, 0, errp);

         goto exit;

     }

     magic = cpu_to_be32(VMDK4_MAGIC);

@@ -2182,7 +2182,7 @@ static int vmdk_init_extent(BlockBackend *blk,

     }

     ret = blk_truncate(blk, le64_to_cpu(header.grain_offset) << 9, false,

-                       PREALLOC_MODE_OFF, errp);

+                       PREALLOC_MODE_OFF, 0, errp);

     if (ret < 0) {

         goto exit;

     }

@@ -2523,7 +2523,7 @@ static int coroutine_fn vmdk_co_do_create(int64_t size,

     /* bdrv_pwrite write padding zeros to align to sector, we don't need that

      * for description file */

     if (desc_offset == 0) {

-        ret = blk_truncate(blk, desc_len, false, PREALLOC_MODE_OFF, errp);

+        ret = blk_truncate(blk, desc_len, false, PREALLOC_MODE_OFF, 0, errp);

         if (ret < 0) {

             goto exit;

         }

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

index 6df75e2..d5e7dc8 100644

--- a/block/vpc.c

+++ b/block/vpc.c

@@ -898,7 +898,7 @@ static int create_fixed_disk(BlockBackend *blk, uint8_t *buf,

     /* Add footer to total size */

     total_size += HEADER_SIZE;

-    ret = blk_truncate(blk, total_size, false, PREALLOC_MODE_OFF, errp);

+    ret = blk_truncate(blk, total_size, false, PREALLOC_MODE_OFF, 0, errp);

     if (ret < 0) {

         return ret;

     }

diff --git a/blockdev.c b/blockdev.c

index 5128c9b..6dde52a 100644

--- a/blockdev.c

+++ b/blockdev.c

@@ -3055,7 +3055,7 @@ void qmp_block_resize(bool has_device, const char *device,

     }

     bdrv_drained_begin(bs);

-    ret = blk_truncate(blk, size, false, PREALLOC_MODE_OFF, errp);

+    ret = blk_truncate(blk, size, false, PREALLOC_MODE_OFF, 0, errp);

     bdrv_drained_end(bs);

 out:

diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h

index 9bbdbd6..34de7fa 100644

--- a/include/sysemu/block-backend.h

+++ b/include/sysemu/block-backend.h

@@ -237,7 +237,7 @@ int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset,

 int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *buf,

                           int bytes);

 int blk_truncate(BlockBackend *blk, int64_t offset, bool exact,

-                 PreallocMode prealloc, Error **errp);

+                 PreallocMode prealloc, BdrvRequestFlags flags, Error **errp);

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

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

                      int64_t pos, int size);

diff --git a/qemu-img.c b/qemu-img.c

index 6dc881b..a27ad70 100644

--- a/qemu-img.c

+++ b/qemu-img.c

@@ -3939,7 +3939,7 @@ static int img_resize(int argc, char **argv)

      * resizing, so pass @exact=true.  It is of no use to report

      * success when the image has not actually been resized.

      */

-    ret = blk_truncate(blk, total_size, true, prealloc, &err;;

+    ret = blk_truncate(blk, total_size, true, prealloc, 0, &err;;

     if (!ret) {

         qprintf(quiet, "Image resized.\n");

     } else {

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c

index 1b7e700..851f07e 100644

--- a/qemu-io-cmds.c

+++ b/qemu-io-cmds.c

@@ -1715,7 +1715,7 @@ static int truncate_f(BlockBackend *blk, int argc, char **argv)

      * exact=true.  It is better to err on the "emit more errors" side

      * than to be overly permissive.

      */

-    ret = blk_truncate(blk, offset, true, PREALLOC_MODE_OFF, &local_err);

+    ret = blk_truncate(blk, offset, true, PREALLOC_MODE_OFF, 0, &local_err);

     if (ret < 0) {

         error_report_err(local_err);

         return ret;

-- 

1.8.3.1