aboutsummaryrefslogtreecommitdiff
path: root/tests/qemu-iotests/070.out
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2019-04-17 12:11:01 -0500
committerKevin Wolf <kwolf@redhat.com>2019-04-30 15:29:00 +0200
commitde38b5005e946aa3714963ea4c501e279e7d3666 (patch)
treee6e90f5ad59e5f74285d3001a4c6e80136c2b6be /tests/qemu-iotests/070.out
parent754da86714d550c3f995f11a2587395081362e0a (diff)
downloadqemu-de38b5005e946aa3714963ea4c501e279e7d3666.zip
qemu-de38b5005e946aa3714963ea4c501e279e7d3666.tar.gz
qemu-de38b5005e946aa3714963ea4c501e279e7d3666.tar.bz2
qemu-img: Saner printing of large file sizes
Disk sizes close to INT64_MAX cause overflow, for some pretty ridiculous output: $ ./nbdkit -U - memory size=$((2**63 - 512)) --run 'qemu-img info $nbd' image: nbd+unix://?socket=/tmp/nbdkitHSAzNz/socket file format: raw virtual size: -8388607T (9223372036854775296 bytes) disk size: unavailable But there's no reason to have two separate implementations of integer to human-readable abbreviation, where one has overflow and stops at 'T', while the other avoids overflow and goes all the way to 'E'. With this patch, the output now claims 8EiB instead of -8388607T, which really is the correct rounding of largest file size supported by qemu (we could go 511 bytes larger if we used byte-accurate sizing instead of rounding up to the next sector boundary, but that wouldn't change the human-readable result). Quite a few iotests need updates to expected output to match. Reported-by: Richard W.M. Jones <rjones@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com> Tested-by: Richard W.M. Jones <rjones@redhat.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Tested-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/070.out')
-rw-r--r--tests/qemu-iotests/070.out2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/070.out b/tests/qemu-iotests/070.out
index c7c5673..2fbfd7e 100644
--- a/tests/qemu-iotests/070.out
+++ b/tests/qemu-iotests/070.out
@@ -22,6 +22,6 @@ read 18874368/18874368 bytes at offset 0
=== Verify image created by Disk2VHD can be opened ===
image: TEST_DIR/test-disk2vhd.IMGFMT
file format: IMGFMT
-virtual size: 256M (268435456 bytes)
+virtual size: 256 MiB (268435456 bytes)
cluster_size: 2097152
*** done