]> git.proxmox.com Git - mirror_qemu.git/commit - block/qapi.c
qemu-img: Saner printing of large file sizes
authorEric Blake <eblake@redhat.com>
Wed, 17 Apr 2019 17:11:01 +0000 (12:11 -0500)
committerKevin Wolf <kwolf@redhat.com>
Tue, 30 Apr 2019 13:29:00 +0000 (15:29 +0200)
commitde38b5005e946aa3714963ea4c501e279e7d3666
treee6e90f5ad59e5f74285d3001a4c6e80136c2b6be
parent754da86714d550c3f995f11a2587395081362e0a
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>
29 files changed:
block/qapi.c
tests/qemu-iotests/043.out
tests/qemu-iotests/053.out
tests/qemu-iotests/059.out
tests/qemu-iotests/060.out
tests/qemu-iotests/061.out
tests/qemu-iotests/070.out
tests/qemu-iotests/082.out
tests/qemu-iotests/084.out
tests/qemu-iotests/089.out
tests/qemu-iotests/095.out
tests/qemu-iotests/104.out
tests/qemu-iotests/110.out
tests/qemu-iotests/114.out
tests/qemu-iotests/126.out
tests/qemu-iotests/130.out
tests/qemu-iotests/153.out
tests/qemu-iotests/191.out
tests/qemu-iotests/195.out
tests/qemu-iotests/198.out
tests/qemu-iotests/206.out
tests/qemu-iotests/207.out
tests/qemu-iotests/210.out
tests/qemu-iotests/211.out
tests/qemu-iotests/212.out
tests/qemu-iotests/213.out
tests/qemu-iotests/233.out
tests/qemu-iotests/237.out
tests/qemu-iotests/242.out