On 14.09.2015 11:57, Kevin Wolf wrote: > Am 14.09.2015 um 11:46 hat Peter Maydell geschrieben: >> On 11 September 2015 at 20:40, Kevin Wolf <kw...@redhat.com> wrote: >>> The following changes since commit 30c38c90bd3f1bb105ebc069ac1821067c980b7c: >>> >>> scripts/qemu-gdb: Add brief comment describing usage (2015-09-11 17:14:50 >>> +0100) >>> >>> are available in the git repository at: >>> >>> git://repo.or.cz/qemu/kevin.git tags/for-upstream >>> >>> for you to fetch changes up to 1fcbcc93872953d08cd35830d1169fed19196290: >>> >>> qcow2: Make qcow2_alloc_bytes() more explicit (2015-09-11 20:03:02 +0200) >>> >>> ---------------------------------------------------------------- >>> Block layer patches >>> >>> ---------------------------------------------------------------- >> >> Hi. I'm afraid this fails to build on 32-bit: >> >> /home/pm215/qemu/block/qcow2-refcount.c: In function >> ‘realloc_refcount_array’: >> /home/pm215/qemu/block/qcow2-refcount.c:1294:16: error: cast to >> pointer from integer of different size [-Werror=int-to-pointer-cast] >> memset((void *)((uintptr_t)new_ptr + old_byte_size), 0, >> ^ >> cc1: all warnings being treated as errors >> /home/pm215/qemu/rules.mak:57: recipe for target 'block/qcow2-refcount.o' >> failed >> make: *** [block/qcow2-refcount.o] Error 1 >> >> (old_byte_size is int64_t, so (uintptr_t)new_ptr + old_byte_size >> becomes a 64-bit addition, and then you cast it to a 32-bit >> pointer.) > > Max, I think this is yours.
Indeed, I'll send a v3 for "qcow2: Make size_to_clusters() return uint64_t" and "iotests: Add test for checking large image files". You decide whether you are going to include them in a new pull request or just drop them for now. Max
signature.asc
Description: OpenPGP digital signature
