From 93330a974c1ab9c4ca861323e53e3c7d01b055c4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 29 Jan 2024 18:23:24 +0000 Subject: [PATCH] Fix builds on i686. --- ...-blkio-Don-t-assume-size_t-is-64-bit.patch | 67 +++++++++++++++++++ qemu.spec | 9 ++- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 0001-block-blkio-Don-t-assume-size_t-is-64-bit.patch diff --git a/0001-block-blkio-Don-t-assume-size_t-is-64-bit.patch b/0001-block-blkio-Don-t-assume-size_t-is-64-bit.patch new file mode 100644 index 0000000..cc553da --- /dev/null +++ b/0001-block-blkio-Don-t-assume-size_t-is-64-bit.patch @@ -0,0 +1,67 @@ +From 02055de1ff1b15c7c12bff0457bae67c3db97f0a Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 29 Jan 2024 18:20:46 +0000 +Subject: [PATCH] block/blkio: Don't assume size_t is 64 bit +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +With GCC 14 the code failed to compile on i686 (and was wrong for any +version of GCC): + +../block/blkio.c: In function ‘blkio_file_open’: +../block/blkio.c:857:28: error: passing argument 3 of ‘blkio_get_uint64’ from incompatible pointer type [-Wincompatible-pointer-types] + 857 | &s->mem_region_alignment); + | ^~~~~~~~~~~~~~~~~~~~~~~~ + | | + | size_t * {aka unsigned int *} +In file included from ../block/blkio.c:12: +/usr/include/blkio.h:49:67: note: expected ‘uint64_t *’ {aka ‘long long unsigned int *’} but argument is of type ‘size_t *’ {aka ‘unsigned int *’} + 49 | int blkio_get_uint64(struct blkio *b, const char *name, uint64_t *value); + | ~~~~~~~~~~^~~~~ + +Signed-off-by: Richard W.M. Jones +--- + block/blkio.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/block/blkio.c b/block/blkio.c +index 0a0a6c0f5fd..52d78935147 100644 +--- a/block/blkio.c ++++ b/block/blkio.c +@@ -794,6 +794,7 @@ static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags, + const char *blkio_driver = bs->drv->protocol_name; + BDRVBlkioState *s = bs->opaque; + int ret; ++ uint64_t val; + + ret = blkio_create(blkio_driver, &s->blkio); + if (ret < 0) { +@@ -854,7 +855,7 @@ static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags, + + ret = blkio_get_uint64(s->blkio, + "mem-region-alignment", +- &s->mem_region_alignment); ++ &val); + if (ret < 0) { + error_setg_errno(errp, -ret, + "failed to get mem-region-alignment: %s", +@@ -862,6 +863,15 @@ static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags, + blkio_destroy(&s->blkio); + return ret; + } ++#if HOST_LONG_BITS == 32 ++ if (val > SIZE_MAX) { ++ error_setg_errno(errp, ERANGE, ++ "mem-region-alignment too large for size_t"); ++ blkio_destroy(&s->blkio); ++ return -ERANGE; ++ } ++#endif ++ s->mem_region_alignment = (size_t)val; + + ret = blkio_get_bool(s->blkio, + "may-pin-mem-regions", +-- +2.43.0 + diff --git a/qemu.spec b/qemu.spec index dd227d2..72e34a7 100644 --- a/qemu.spec +++ b/qemu.spec @@ -358,7 +358,7 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 4 +%global baserelease 5 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -386,6 +386,10 @@ Patch: 0001-include-ui-rect.h-fix-qemu_rect_init-mis-assignment.patch # https://patchew.org/QEMU/20240101230617.129349-1-richard.henderson@linaro.org Patch: 0001-target-i386-do-not-re-compute-new-pc-with-CF_PCREL.patch +# Fix builds on i686. +# Sent upstream 29-01-2024 +Patch: 0001-block-blkio-Don-t-assume-size_t-is-64-bit.patch + Source10: qemu-guest-agent.service Source11: 99-qemu-guest-agent.rules Source12: bridge.conf @@ -3148,6 +3152,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Mon Jan 29 2024 Richard W.M. Jones - 8.2.0-5 +- Fix builds on i686. + * Fri Jan 26 2024 Fedora Release Engineering - 2:8.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild