Commit 43d589b0 authored by Eyal Moscovici's avatar Eyal Moscovici Committed by Eric Blake
Browse files

qemu_img: add cvtnum_full to print error reports 



All calls to cvtnum check the return value and print the same error
message more or less. And so error reporting moved to cvtnum_full to
reduce code duplication and provide a single error
message. Additionally, cvtnum now wraps cvtnum_full with the existing
default range of 0 to MAX_INT64.

Acked-by: default avatarMark Kanda <mark.kanda@oracle.com>
Signed-off-by: default avatarEyal Moscovici <eyal.moscovici@oracle.com>
Message-Id: <20200513133629.18508-2-eyal.moscovici@oracle.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
[eblake: fix printf formatting, avoid trailing space, change error wording,
reformat commit message]
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent 0eaf453e

qemu-img.c

+34 −42
Original line number Diff line number Diff line
@@ -470,19 +470,31 @@ static int add_old_style_options(const char *fmt, QemuOpts *opts, 
    return 0;

}



static int64_t cvtnum(const char *s)

static int64_t cvtnum_full(const char *name, const char *value, int64_t min,

                           int64_t max)

{

    int err;

    uint64_t value;

    uint64_t res;



    err = qemu_strtosz(s, NULL, &value);

    if (err < 0) {

    err = qemu_strtosz(value, NULL, &res);

    if (err < 0 && err != -ERANGE) {

        error_report("Invalid %s specified. You may use "

                     "k, M, G, T, P or E suffixes for", name);

        error_report("kilobytes, megabytes, gigabytes, terabytes, "

                     "petabytes and exabytes.");

        return err;

    }

    if (value > INT64_MAX) {

    if (err == -ERANGE || res > max || res < min) {

        error_report("Invalid %s specified. Must be between %" PRId64

                     " and %" PRId64 ".", name, min, max);

        return -ERANGE;

    }

    return value;

    return res;

}



static int64_t cvtnum(const char *name, const char *value)

{

    return cvtnum_full(name, value, 0, INT64_MAX);

}



static int img_create(int argc, char **argv)
@@ -572,16 +584,8 @@ static int img_create(int argc, char **argv) 
    if (optind < argc) {

        int64_t sval;



        sval = cvtnum(argv[optind++]);

        sval = cvtnum("image size", argv[optind++]);

        if (sval < 0) {

            if (sval == -ERANGE) {

                error_report("Image size must be less than 8 EiB!");

            } else {

                error_report("Invalid image size specified! You may use k, M, "

                      "G, T, P or E suffixes for ");

                error_report("kilobytes, megabytes, gigabytes, terabytes, "

                             "petabytes and exabytes.");

            }

            goto fail;

        }

        img_size = (uint64_t)sval;
@@ -2187,8 +2191,10 @@ static int img_convert(int argc, char **argv) 
        {

            int64_t sval;



            sval = cvtnum(optarg);

            if (sval < 0 || !QEMU_IS_ALIGNED(sval, BDRV_SECTOR_SIZE) ||

            sval = cvtnum("buffer size for sparse output", optarg);

            if (sval < 0) {

                goto fail_getopt;

            } else if (!QEMU_IS_ALIGNED(sval, BDRV_SECTOR_SIZE) ||

                sval / BDRV_SECTOR_SIZE > MAX_BUF_SECTORS) {

                error_report("Invalid buffer size for sparse output specified. "

                    "Valid sizes are multiples of %llu up to %llu. Select "
@@ -4291,9 +4297,8 @@ static int img_bench(int argc, char **argv) 
            break;

        case 'o':

        {

            offset = cvtnum(optarg);

            offset = cvtnum("offset", optarg);

            if (offset < 0) {

                error_report("Invalid offset specified");

                return 1;

            }

            break;
@@ -4306,9 +4311,8 @@ static int img_bench(int argc, char **argv) 
        {

            int64_t sval;



            sval = cvtnum(optarg);

            if (sval < 0 || sval > INT_MAX) {

                error_report("Invalid buffer size specified");

            sval = cvtnum_full("buffer size", optarg, 0, INT_MAX);

            if (sval < 0) {

                return 1;

            }
@@ -4319,9 +4323,8 @@ static int img_bench(int argc, char **argv) 
        {

            int64_t sval;



            sval = cvtnum(optarg);

            if (sval < 0 || sval > INT_MAX) {

                error_report("Invalid step size specified");

            sval = cvtnum_full("step_size", optarg, 0, INT_MAX);

            if (sval < 0) {

                return 1;

            }
@@ -4491,10 +4494,9 @@ static int img_dd_bs(const char *arg, 
{

    int64_t res;



    res = cvtnum(arg);

    res = cvtnum_full("bs", arg, 1, INT_MAX);



    if (res <= 0 || res > INT_MAX) {

        error_report("invalid number: '%s'", arg);

    if (res < 0) {

        return 1;

    }

    in->bsz = out->bsz = res;
@@ -4506,10 +4508,9 @@ static int img_dd_count(const char *arg, 
                        struct DdIo *in, struct DdIo *out,

                        struct DdInfo *dd)

{

    dd->count = cvtnum(arg);

    dd->count = cvtnum("count", arg);



    if (dd->count < 0) {

        error_report("invalid number: '%s'", arg);

        return 1;

    }
@@ -4538,10 +4539,9 @@ static int img_dd_skip(const char *arg, 
                       struct DdIo *in, struct DdIo *out,

                       struct DdInfo *dd)

{

    in->offset = cvtnum(arg);

    in->offset = cvtnum("skip", arg);



    if (in->offset < 0) {

        error_report("invalid number: '%s'", arg);

        return 1;

    }
@@ -4923,16 +4923,8 @@ static int img_measure(int argc, char **argv) 
        {

            int64_t sval;



            sval = cvtnum(optarg);

            sval = cvtnum("image size", optarg);

            if (sval < 0) {

                if (sval == -ERANGE) {

                    error_report("Image size must be less than 8 EiB!");

                } else {

                    error_report("Invalid image size specified! You may use "

                                 "k, M, G, T, P or E suffixes for ");

                    error_report("kilobytes, megabytes, gigabytes, terabytes, "

                                 "petabytes and exabytes.");

                }

                goto out;

            }

            img_size = (uint64_t)sval;

tests/qemu-iotests/049.out

+4 −4
Original line number Diff line number Diff line
@@ -92,19 +92,19 @@ Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 l 
== 3. Invalid sizes ==



qemu-img create -f qcow2 TEST_DIR/t.qcow2 -- -1024

qemu-img: Image size must be less than 8 EiB!

qemu-img: Invalid image size specified. Must be between 0 and 9223372036854775807.



qemu-img create -f qcow2 -o size=-1024 TEST_DIR/t.qcow2

qemu-img: TEST_DIR/t.qcow2: Value '-1024' is out of range for parameter 'size'



qemu-img create -f qcow2 TEST_DIR/t.qcow2 -- -1k

qemu-img: Image size must be less than 8 EiB!

qemu-img: Invalid image size specified. Must be between 0 and 9223372036854775807.



qemu-img create -f qcow2 -o size=-1k TEST_DIR/t.qcow2

qemu-img: TEST_DIR/t.qcow2: Value '-1k' is out of range for parameter 'size'



qemu-img create -f qcow2 TEST_DIR/t.qcow2 -- 1kilobyte

qemu-img: Invalid image size specified! You may use k, M, G, T, P or E suffixes for

qemu-img: Invalid image size specified. You may use k, M, G, T, P or E suffixes for

qemu-img: kilobytes, megabytes, gigabytes, terabytes, petabytes and exabytes.



qemu-img create -f qcow2 -o size=1kilobyte TEST_DIR/t.qcow2
@@ -113,7 +113,7 @@ Optional suffix k, M, G, T, P or E means kilo-, mega-, giga-, tera-, peta- 
and exabytes, respectively.



qemu-img create -f qcow2 TEST_DIR/t.qcow2 -- foobar

qemu-img: Invalid image size specified! You may use k, M, G, T, P or E suffixes for

qemu-img: Invalid image size specified. You may use k, M, G, T, P or E suffixes for

qemu-img: kilobytes, megabytes, gigabytes, terabytes, petabytes and exabytes.



qemu-img create -f qcow2 -o size=foobar TEST_DIR/t.qcow2