[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/18] qemu-img: report size overflow error message
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 15/18] qemu-img: report size overflow error message |
Date: |
Wed, 2 Jan 2013 16:15:53 +0100 |
From: liguang <address@hidden>
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 <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
qemu-img.c | 10 +++++++---
1 file 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;
--
1.8.0.2
- [Qemu-devel] [PATCH 03/18] dataplane: add host memory mapping code, (continued)
- [Qemu-devel] [PATCH 03/18] dataplane: add host memory mapping code, Stefan Hajnoczi, 2013/01/02
- [Qemu-devel] [PATCH 04/18] dataplane: add virtqueue vring code, Stefan Hajnoczi, 2013/01/02
- [Qemu-devel] [PATCH 06/18] dataplane: add Linux AIO request queue, Stefan Hajnoczi, 2013/01/02
- [Qemu-devel] [PATCH 08/18] test-iov: add iov_discard_front/back() testcases, Stefan Hajnoczi, 2013/01/02
- [Qemu-devel] [PATCH 07/18] iov: add iov_discard_front/back() to remove data, Stefan Hajnoczi, 2013/01/02
- [Qemu-devel] [PATCH 05/18] dataplane: add event loop, Stefan Hajnoczi, 2013/01/02
- [Qemu-devel] [PATCH 10/18] virtio-blk: restore VirtIOBlkConf->config_wce flag, Stefan Hajnoczi, 2013/01/02
- [Qemu-devel] [PATCH 09/18] iov: add qemu_iovec_concat_iov(), Stefan Hajnoczi, 2013/01/02
- [Qemu-devel] [PATCH 12/18] virtio-blk: add x-data-plane=on|off performance feature, Stefan Hajnoczi, 2013/01/02
- [Qemu-devel] [PATCH 11/18] dataplane: add virtio-blk data plane code, Stefan Hajnoczi, 2013/01/02
- [Qemu-devel] [PATCH 15/18] qemu-img: report size overflow error message,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 13/18] virtio-blk: Return UNSUPP for unknown request types, Stefan Hajnoczi, 2013/01/02
- [Qemu-devel] [PATCH 18/18] sheepdog: pass oid directly to send_pending_req(), Stefan Hajnoczi, 2013/01/02
- [Qemu-devel] [PATCH 16/18] block/raw-win32: Fix compiler warnings (wrong format specifiers), Stefan Hajnoczi, 2013/01/02
- [Qemu-devel] [PATCH 14/18] cutils: change strtosz_suffix_unit function, Stefan Hajnoczi, 2013/01/02
- [Qemu-devel] [PATCH 17/18] sheepdog: don't update inode when create_and_write fails, Stefan Hajnoczi, 2013/01/02
- Re: [Qemu-devel] [PULL v2 00/18] Block patches, Anthony Liguori, 2013/01/02