Patchwork [15/18] qemu-img: report size overflow error message

login
register
mail settings
Submitter Stefan Hajnoczi
Date Dec. 19, 2012, 3:38 p.m.
Message ID <1355931499-7912-16-git-send-email-stefanha@redhat.com>
Download mbox | patch
Permalink /patch/207420/
State New
Headers show

Comments

Stefan Hajnoczi - Dec. 19, 2012, 3:38 p.m.
From: liguang <lig.fnst@cn.fujitsu.com>

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: liguang <lig.fnst@cn.fujitsu.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 qemu-img.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Patch

diff --git a/qemu-img.c b/qemu-img.c
index c989a52..da44685 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -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 ");
-            error_report("kilobytes, megabytes, gigabytes and terabytes.");
+            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;