aboutsummaryrefslogtreecommitdiff
path: root/qemu-img.c
diff options
context:
space:
mode:
authorliguang <lig.fnst@cn.fujitsu.com>2012-12-17 09:49:23 +0800
committerStefan Hajnoczi <stefanha@redhat.com>2013-01-02 16:08:56 +0100
commit7944339726b4582b67fd94085c21c33636e8f973 (patch)
treeb66d915ce3f2c4d82661e798a88e73507de73865 /qemu-img.c
parent37edbf7ea8067262a5c3d8bbe4786139348c8311 (diff)
downloadqemu-7944339726b4582b67fd94085c21c33636e8f973.zip
qemu-7944339726b4582b67fd94085c21c33636e8f973.tar.gz
qemu-7944339726b4582b67fd94085c21c33636e8f973.tar.bz2
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: liguang <lig.fnst@cn.fujitsu.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'qemu-img.c')
-rw-r--r--qemu-img.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/qemu-img.c b/qemu-img.c
index 69cc028..85d3740 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;