qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com,
	eblake@redhat.com, armbru@redhat.com, fam@euphon.net,
	stefanha@redhat.com, mreitz@redhat.com, kwolf@redhat.com,
	den@virtuozzo.com
Subject: [PATCH v7 09/21] qemu-io: add preallocate mode parameter for truncate command
Date: Wed, 21 Oct 2020 17:58:47 +0300	[thread overview]
Message-ID: <20201021145859.11201-10-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20201021145859.11201-1-vsementsov@virtuozzo.com>

This will be used in further test.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
 qemu-io-cmds.c | 46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index 4153f1c0b0..97611969cb 100644
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -1698,13 +1698,42 @@ static const cmdinfo_t flush_cmd = {
     .oneline    = "flush all in-core file state to disk",
 };
 
+static int truncate_f(BlockBackend *blk, int argc, char **argv);
+static const cmdinfo_t truncate_cmd = {
+    .name       = "truncate",
+    .altname    = "t",
+    .cfunc      = truncate_f,
+    .perm       = BLK_PERM_WRITE | BLK_PERM_RESIZE,
+    .argmin     = 1,
+    .argmax     = 3,
+    .args       = "[-m prealloc_mode] off",
+    .oneline    = "truncates the current file at the given offset",
+};
+
 static int truncate_f(BlockBackend *blk, int argc, char **argv)
 {
     Error *local_err = NULL;
     int64_t offset;
-    int ret;
+    int c, ret;
+    PreallocMode prealloc = PREALLOC_MODE_OFF;
 
-    offset = cvtnum(argv[1]);
+    while ((c = getopt(argc, argv, "m:")) != -1) {
+        switch (c) {
+        case 'm':
+            prealloc = qapi_enum_parse(&PreallocMode_lookup, optarg,
+                                       PREALLOC_MODE__MAX, NULL);
+            if (prealloc == PREALLOC_MODE__MAX) {
+                error_report("Invalid preallocation mode '%s'", optarg);
+                return -EINVAL;
+            }
+            break;
+        default:
+            qemuio_command_usage(&truncate_cmd);
+            return -EINVAL;
+        }
+    }
+
+    offset = cvtnum(argv[optind]);
     if (offset < 0) {
         print_cvtnum_err(offset, argv[1]);
         return offset;
@@ -1715,7 +1744,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, false, PREALLOC_MODE_OFF, 0, &local_err);
+    ret = blk_truncate(blk, offset, false, prealloc, 0, &local_err);
     if (ret < 0) {
         error_report_err(local_err);
         return ret;
@@ -1724,17 +1753,6 @@ static int truncate_f(BlockBackend *blk, int argc, char **argv)
     return 0;
 }
 
-static const cmdinfo_t truncate_cmd = {
-    .name       = "truncate",
-    .altname    = "t",
-    .cfunc      = truncate_f,
-    .perm       = BLK_PERM_WRITE | BLK_PERM_RESIZE,
-    .argmin     = 1,
-    .argmax     = 1,
-    .args       = "off",
-    .oneline    = "truncates the current file at the given offset",
-};
-
 static int length_f(BlockBackend *blk, int argc, char **argv)
 {
     int64_t size;
-- 
2.21.3



  parent reply	other threads:[~2020-10-21 15:18 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-21 14:58 [PATCH v7 00/21] preallocate filter Vladimir Sementsov-Ogievskiy
2020-10-21 14:58 ` [PATCH v7 01/21] block: simplify comment to BDRV_REQ_SERIALISING Vladimir Sementsov-Ogievskiy
2020-10-21 14:58 ` [PATCH v7 02/21] block/io.c: drop assertion on double waiting for request serialisation Vladimir Sementsov-Ogievskiy
2020-10-21 14:58 ` [PATCH v7 03/21] block/io: split out bdrv_find_conflicting_request Vladimir Sementsov-Ogievskiy
2020-10-21 14:58 ` [PATCH v7 04/21] block/io: bdrv_wait_serialising_requests_locked: drop extra bs arg Vladimir Sementsov-Ogievskiy
2020-10-21 14:58 ` [PATCH v7 05/21] block: bdrv_mark_request_serialising: split non-waiting function Vladimir Sementsov-Ogievskiy
2020-10-21 14:58 ` [PATCH v7 06/21] block: introduce BDRV_REQ_NO_WAIT flag Vladimir Sementsov-Ogievskiy
2020-10-21 14:58 ` [PATCH v7 07/21] block: bdrv_check_perm(): process children anyway Vladimir Sementsov-Ogievskiy
2020-11-13 13:59   ` Max Reitz
2020-10-21 14:58 ` [PATCH v7 08/21] block: introduce preallocate filter Vladimir Sementsov-Ogievskiy
2020-11-13 14:32   ` Max Reitz
2020-11-13 15:46     ` Vladimir Sementsov-Ogievskiy
2020-10-21 14:58 ` Vladimir Sementsov-Ogievskiy [this message]
2020-10-21 14:58 ` [PATCH v7 10/21] iotests: qemu_io_silent: support --image-opts Vladimir Sementsov-Ogievskiy
2020-10-21 14:58 ` [PATCH v7 11/21] iotests.py: execute_setup_common(): add required_fmts argument Vladimir Sementsov-Ogievskiy
2020-11-13 14:42   ` Max Reitz
2020-10-21 14:58 ` [PATCH v7 12/21] iotests: add 298 to test new preallocate filter driver Vladimir Sementsov-Ogievskiy
2020-11-13 14:43   ` Max Reitz
2020-10-21 14:58 ` [PATCH v7 13/21] scripts/simplebench: fix grammar: s/successed/succeeded/ Vladimir Sementsov-Ogievskiy
2020-11-13 14:44   ` Max Reitz
2020-10-21 14:58 ` [PATCH v7 14/21] scripts/simplebench: support iops Vladimir Sementsov-Ogievskiy
2020-11-13 15:02   ` Max Reitz
2020-10-21 14:58 ` [PATCH v7 15/21] scripts/simplebench: use standard deviation for +- error Vladimir Sementsov-Ogievskiy
2020-11-13 15:30   ` Max Reitz
2020-10-21 14:58 ` [PATCH v7 16/21] simplebench: rename ascii() to results_to_text() Vladimir Sementsov-Ogievskiy
2020-11-13 15:31   ` Max Reitz
2020-10-21 14:58 ` [PATCH v7 17/21] simplebench: move results_to_text() into separate file Vladimir Sementsov-Ogievskiy
2020-11-13 15:39   ` Max Reitz
2020-10-21 14:58 ` [PATCH v7 18/21] simplebench/results_to_text: improve view of the table Vladimir Sementsov-Ogievskiy
2020-11-13 15:59   ` Max Reitz
2020-11-13 16:24     ` Vladimir Sementsov-Ogievskiy
2020-10-21 14:58 ` [PATCH v7 19/21] simplebench/results_to_text: add difference line to " Vladimir Sementsov-Ogievskiy
2020-10-24 10:24   ` Vladimir Sementsov-Ogievskiy
2020-11-13 16:21   ` Max Reitz
2020-10-21 14:58 ` [PATCH v7 20/21] simplebench/results_to_text: make executable Vladimir Sementsov-Ogievskiy
2020-11-13 16:22   ` Max Reitz
2020-10-21 14:58 ` [PATCH v7 21/21] scripts/simplebench: add bench_prealloc.py Vladimir Sementsov-Ogievskiy
2020-11-13 16:24   ` Max Reitz
2020-11-13 18:00     ` Vladimir Sementsov-Ogievskiy
2020-11-13 19:32       ` Max Reitz
2020-11-13 19:33 ` [PATCH v7 00/21] preallocate filter Max Reitz
2020-11-16  9:32   ` Vladimir Sementsov-Ogievskiy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201021145859.11201-10-vsementsov@virtuozzo.com \
    --to=vsementsov@virtuozzo.com \
    --cc=armbru@redhat.com \
    --cc=den@virtuozzo.com \
    --cc=eblake@redhat.com \
    --cc=fam@euphon.net \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).