diff mbox series

[PULL,07/27] cutils: Fix size_to_str() on 32-bit platforms

Message ID	20190430154244.30083-8-kwolf@redhat.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> From: Kevin Wolf <kwolf@redhat.com> To: qemu-block@nongnu.org Date: Tue, 30 Apr 2019 17:42:24 +0200 Message-Id: <20190430154244.30083-8-kwolf@redhat.com> In-Reply-To: <20190430154244.30083-1-kwolf@redhat.com> References: <20190430154244.30083-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 07/27] cutils: Fix size_to_str() on 32-bit platforms Precedence: list Cc: kwolf@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>
Series	[PULL,01/27] tests/qemu-iotests: Fix output of qemu-io related tests \| expand [PULL,01/27] tests/qemu-iotests: Fix output of qemu-io related tests [PULL,02/27] block: Fix AioContext switch for bs->drv == NULL [PULL,03/27] vpc: unlock Coroutine lock to make IO submit Concurrently [PULL,04/27] vmdk: Set vmdk parent backing_format to vmdk [PULL,05/27] block/vhdx: Remove redundant IEC binary prefixes definition [PULL,06/27] block/vhdx: Use IEC binary prefixes for size constants [PULL,07/27] cutils: Fix size_to_str() on 32-bit platforms [PULL,08/27] qemu-img: Saner printing of large file sizes [PULL,09/27] qcow2: Avoid COW during metadata preallocation [PULL,10/27] qcow2: Add errp to preallocate_co() [PULL,11/27] qcow2: Fix full preallocation with external data file [PULL,12/27] iotests: Perform the correct test in 082 [PULL,13/27] qemu-img: Make create hint at protocol options [PULL,14/27] qcow2: Fix qcow2_make_empty() with external data file [PULL,15/27] qcow2: Fix error handling in the compression code [PULL,16/27] block: introduce byte-based io helpers [PULL,17/27] block/qcow2: use buffer-based io [PULL,18/27] block/qcow: use buffer-based io [PULL,19/27] block/qed: use buffer-based io [PULL,20/27] block/parallels: use buffer-based io [PULL,21/27] block/backup: use buffer-based io [PULL,22/27] block/commit: use buffer-based io [PULL,23/27] block/stream: use buffer-based io [PULL,24/27] qemu-img: use buffer-based io [PULL,25/27] commit: Make base read-only if there is an early failure [PULL,26/27] iotests: Check that images are in read-only mode after block-commit [PULL,27/27] block/qed: add missed coroutine_fn markers

Commit Message

Kevin Wolf April 30, 2019, 3:42 p.m. UTC

From: Eric Blake <eblake@redhat.com>

When extracting a human-readable size formatter, we changed 'uint64_t
div' pre-patch to 'unsigned long div' post-patch. Which breaks on
32-bit platforms, resulting in 'inf' instead of intended values larger
than 999GB.

Fixes: 22951aaa
CC: qemu-stable@nongnu.org
Reported-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 util/cutils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/util/cutils.c b/util/cutils.c
index e098debdc0..d682c90901 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -825,7 +825,7 @@  const char *qemu_ether_ntoa(const MACAddr *mac)
 char *size_to_str(uint64_t val)
 {
     static const char *suffixes[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei" };
-    unsigned long div;
+    uint64_t div;
     int i;
 
     /*