Commit 79443397 authored by liguang's avatar liguang Committed by Stefan Hajnoczi
Browse files

qemu-img: report size overflow error message 



qemu-img will complain when qcow or qcow2
size overflow for 64 bits, report the right
message in this condition.

$./qemu-img create -f qcow2 /tmp/foo 0x10000000000000000
before change:
qemu-img: Invalid image size specified! You may use k, M, G or T suffixes for
qemu-img: kilobytes, megabytes, gigabytes and terabytes.

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

[Resolved conflict with a9300911 goto removal -- Stefan]

Signed-off-by: default avatarliguang <lig.fnst@cn.fujitsu.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 37edbf7e

qemu-img.c

+7 −3
Original line number Diff line number Diff line
@@ -348,9 +348,13 @@ static int img_create(int argc, char **argv) 
        char *end;

        sval = strtosz_suffix(argv[optind++], &end, STRTOSZ_DEFSUFFIX_B);

        if (sval < 0 || *end) {

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

                  "T suffixes for ");

            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 or T suffixes for ");

                error_report("kilobytes, megabytes, gigabytes and terabytes.");

            }

            return 1;

        }

        img_size = (uint64_t)sval;