[PATCH 8/8] qemu-img: refresh options/--help for "convert" command

[Michael Tokarev]

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 qemu-img.c | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/qemu-img.c b/qemu-img.c
index ea3fe95169..c8fba27e35 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2351,14 +2351,28 @@ static int img_convert(const char *cmdname, int argc, 
char **argv)
     for(;;) {
         static const struct option long_options[] = {
             {"help", no_argument, 0, 'h'},
+            {"quiet", no_argument, 0, 'q'},
             {"object", required_argument, 0, OPTION_OBJECT},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},
+            {"source-format", required_argument, 0, 'f'},
+            {"source-cache", required_argument, 0, 'T'},
+            {"snapshot", required_argument, 0, 'l'},
+            {"sparse-size", required_argument, 0, 'S'},
+            {"output-format", required_argument, 0, 'O'},
+            {"options", required_argument, 0, 'o'},
+            {"output-cache", required_argument, 0, 't'},
+            {"backing", required_argument, 0, 'B'},
+            {"backing-format", required_argument, 0, 'F'},
             {"force-share", no_argument, 0, 'U'},
             {"target-image-opts", no_argument, 0, OPTION_TARGET_IMAGE_OPTS},
             {"salvage", no_argument, 0, OPTION_SALVAGE},
             {"target-is-zero", no_argument, 0, OPTION_TARGET_IS_ZERO},
             {"bitmaps", no_argument, 0, OPTION_BITMAPS},
             {"skip-broken-bitmaps", no_argument, 0, OPTION_SKIP_BROKEN},
+            {"rate", required_argument, 0, 'r'},
+            {"parallel", required_argument, 0, 'm'},
+            {"oob-writes", no_argument, 0, 'W'},
+            {"copy-range-offloading", no_argument, 0, 'C'},
             {0, 0, 0, 0}
         };
         c = getopt_long(argc, argv, ":hf:O:B:CcF:o:l:S:pt:T:qnm:WUr:",
@@ -2374,7 +2388,37 @@ static int img_convert(const char *cmdname, int argc, 
char **argv)
             unrecognized_option(cmdname, argv[optind - 1]);
             break;
         case 'h':
-            help();
+            cmd_help(cmdname, "[OPTIONS] FILENAME [FILENAME2 [...]] 
OUTPUT_FILENAME",
+                     "Convert image FILENAME (or a snapshot) to new image 
OUTPUT_FILENAME",
+" -q|--quiet - quiet operations\n"
+" -f|--source-format SFMT - specify FILENAME source image format explicitly\n"
+" --image-opts - indicates that FILENAME is a complete image specification\n"
+"  instead of a file name (incompatible with --source-format)\n"
+" -T|--source-cache CACHE_MODE - cache mode when opening source image (" 
BDRV_DEFAULT_CACHE ")\n"
+" -O|--output-format OFMT - specify OUTPUT_FILENAME image format (default is 
raw)\n"
+" --target-image-opts - indicates that OUTPUT_FILENAME is a complete image 
specification\n"
+"  instead of a file name (incompatible with --output-format)\n"
+" -o|--options OPTS - OFMT-specific options\n"
+" -c|--compress - create compressed output image (qcow and qcow2 format 
only)\n"
+" -t|--output-cache CACHE_MODE - cache mode when opening output image (" 
BDRV_DEFAULT_CACHE ")\n"
+" -B|--backing BACKING_FILENAME - create output to be a CoW on top of 
BACKING_FILENAME\n"
+" -F|--backing-format BFMT - specify BACKING_FILENAME image format 
explicitly\n"
+" --target-is-zero\n"
+" -l|--snapshot SNAPSHOT_PARAMS\n"
+" -S|--sparse-size SPARSE_SIZE\n"
+" --bitmaps - also copy any persistent bitmaps present in source\n"
+" --skip-broken-bitmaps - skip (do not error out) any broken bitmaps\n"
+" -U|--force-share - open images in shared mode for concurrent access\n"
+" -p|--progress - show operation progress\n"
+" -r|--rate RATE\n"
+" -m|--parallel NUM_COROUTINES - specify parallelism (default 8)\n"
+" -C|--copy-range-offloading - use copy_range offloading\n"
+" --salvage\n"
+" -W - enable out-of-order writes to improve performance\n"
+" -n|--no-create - omit target volume creation (eg on rbd)\n"
+" --object OBJDEF - QEMU user-creatable object (eg encryption key)\n"
+" FILENAME - source image file name\n"
+" OUTPUT_FILENAME - destination (output) image file name\n");
             break;
         case 'f':
             fmt = optarg;
-- 
2.39.2