From c8c91351c0ffe2ca9ea169f912271adceb67403b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Jan 2024 09:13:52 +0000 Subject: [PATCH] Fix builds on i686 (v2 of the patch) https://lists.nongnu.org/archive/html/qemu-block/2024-01/msg00430.html --- ...-blkio-Don-t-assume-size_t-is-64-bit.patch | 67 ------------------- ...ke-s-mem_region_alignment-be-64-bits.patch | 43 ++++++++++++ qemu.spec | 2 +- 3 files changed, 44 insertions(+), 68 deletions(-) delete mode 100644 0001-block-blkio-Don-t-assume-size_t-is-64-bit.patch create mode 100644 0001-block-blkio-Make-s-mem_region_alignment-be-64-bits.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 deleted file mode 100644 index cc553da..0000000 --- a/0001-block-blkio-Don-t-assume-size_t-is-64-bit.patch +++ /dev/null @@ -1,67 +0,0 @@ -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/0001-block-blkio-Make-s-mem_region_alignment-be-64-bits.patch b/0001-block-blkio-Make-s-mem_region_alignment-be-64-bits.patch new file mode 100644 index 0000000..05c6f18 --- /dev/null +++ b/0001-block-blkio-Make-s-mem_region_alignment-be-64-bits.patch @@ -0,0 +1,43 @@ +From 500f3a81652dcefa79a4864c1f3fa6747c16952e 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: Make s->mem_region_alignment be 64 bits +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 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/block/blkio.c b/block/blkio.c +index 0a0a6c0f5fd..bc2f21784c7 100644 +--- a/block/blkio.c ++++ b/block/blkio.c +@@ -68,7 +68,7 @@ typedef struct { + CoQueue bounce_available; + + /* The value of the "mem-region-alignment" property */ +- size_t mem_region_alignment; ++ uint64_t mem_region_alignment; + + /* Can we skip adding/deleting blkio_mem_regions? */ + bool needs_mem_regions; +-- +2.43.0 + diff --git a/qemu.spec b/qemu.spec index 72e34a7..995a73e 100644 --- a/qemu.spec +++ b/qemu.spec @@ -388,7 +388,7 @@ 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 +Patch: 0001-block-blkio-Make-s-mem_region_alignment-be-64-bits.patch Source10: qemu-guest-agent.service Source11: 99-qemu-guest-agent.rules