Patchwork qemu-img: correct help message

login
register
mail settings
Submitter Robert Wang
Date July 12, 2012, 2:40 a.m.
Message ID <1342060843-27453-1-git-send-email-wdongxu@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/170542/
State New
Headers show

Comments

Robert Wang - July 12, 2012, 2:40 a.m.
qemu-img not only suports k/K/M/G/T/b, but also supports m/g/t/B. So correct
it in help message.

Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
---
 qemu-img.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
dunrong huang - July 12, 2012, 2:56 a.m.
2012/7/12 Dong Xu Wang <wdongxu@linux.vnet.ibm.com>:
> qemu-img not only suports k/K/M/G/T/b, but also supports m/g/t/B. So correct
> it in help message.
>
> Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
> ---
>  qemu-img.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/qemu-img.c b/qemu-img.c
> index 80cfb9b..533eac2 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -69,8 +69,9 @@ static void help(void)
>             "    options are: 'none', 'writeback' (default, except for convert), 'writethrough',\n"
>             "    'directsync' and 'unsafe' (default for convert)\n"
>             "  'size' is the disk image size in bytes. Optional suffixes\n"
> -           "    'k' or 'K' (kilobyte, 1024), 'M' (megabyte, 1024k), 'G' (gigabyte, 1024M)\n"
> -           "    and T (terabyte, 1024G) are supported. 'b' is ignored.\n"
> +           "    'k' or 'K' (kilobyte, 1024), 'm' or 'M' (megabyte, 1024k),\n"
> +           "    'g' or 'G' (gigabyte, 1024M) and 't' or 'T' (terabyte, 1024G) are supported.\n"
> +           "    'b' or 'B' is ignored.\n"
>             "  'output_filename' is the destination disk image filename\n"
>             "  'output_fmt' is the destination format\n"
>             "  'options' is a comma separated list of format specific options in a\n"
Those error reporting also need to be corrected:
        if (sval < 0 || *end) {
            error_report("Invalid image size specified! You may use k, M, G or "
                  "T suffixes for ");
            error_report("kilobytes, megabytes, gigabytes and terabytes.");
            ret = -1;
            goto out;
        }

Patch

diff --git a/qemu-img.c b/qemu-img.c
index 80cfb9b..533eac2 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -69,8 +69,9 @@  static void help(void)
            "    options are: 'none', 'writeback' (default, except for convert), 'writethrough',\n"
            "    'directsync' and 'unsafe' (default for convert)\n"
            "  'size' is the disk image size in bytes. Optional suffixes\n"
-           "    'k' or 'K' (kilobyte, 1024), 'M' (megabyte, 1024k), 'G' (gigabyte, 1024M)\n"
-           "    and T (terabyte, 1024G) are supported. 'b' is ignored.\n"
+           "    'k' or 'K' (kilobyte, 1024), 'm' or 'M' (megabyte, 1024k),\n"
+           "    'g' or 'G' (gigabyte, 1024M) and 't' or 'T' (terabyte, 1024G) are supported.\n"
+           "    'b' or 'B' is ignored.\n"
            "  'output_filename' is the destination disk image filename\n"
            "  'output_fmt' is the destination format\n"
            "  'options' is a comma separated list of format specific options in a\n"