c8c9135
From 500f3a81652dcefa79a4864c1f3fa6747c16952e Mon Sep 17 00:00:00 2001
93330a9
From: "Richard W.M. Jones" <rjones@redhat.com>
93330a9
Date: Mon, 29 Jan 2024 18:20:46 +0000
c8c9135
Subject: [PATCH] block/blkio: Make s->mem_region_alignment be 64 bits
93330a9
MIME-Version: 1.0
93330a9
Content-Type: text/plain; charset=UTF-8
93330a9
Content-Transfer-Encoding: 8bit
93330a9
93330a9
With GCC 14 the code failed to compile on i686 (and was wrong for any
93330a9
version of GCC):
93330a9
93330a9
../block/blkio.c: In function ‘blkio_file_open’:
93330a9
../block/blkio.c:857:28: error: passing argument 3 of ‘blkio_get_uint64’ from incompatible pointer type [-Wincompatible-pointer-types]
93330a9
  857 |                            &s->mem_region_alignment);
93330a9
      |                            ^~~~~~~~~~~~~~~~~~~~~~~~
93330a9
      |                            |
93330a9
      |                            size_t * {aka unsigned int *}
93330a9
In file included from ../block/blkio.c:12:
93330a9
/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 *’}
93330a9
   49 | int blkio_get_uint64(struct blkio *b, const char *name, uint64_t *value);
93330a9
      |                                                         ~~~~~~~~~~^~~~~
93330a9
93330a9
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
93330a9
---
c8c9135
 block/blkio.c | 2 +-
c8c9135
 1 file changed, 1 insertion(+), 1 deletion(-)
93330a9
93330a9
diff --git a/block/blkio.c b/block/blkio.c
c8c9135
index 0a0a6c0f5fd..bc2f21784c7 100644
93330a9
--- a/block/blkio.c
93330a9
+++ b/block/blkio.c
c8c9135
@@ -68,7 +68,7 @@ typedef struct {
c8c9135
     CoQueue bounce_available;
93330a9
 
c8c9135
     /* The value of the "mem-region-alignment" property */
c8c9135
-    size_t mem_region_alignment;
c8c9135
+    uint64_t mem_region_alignment;
93330a9
 
c8c9135
     /* Can we skip adding/deleting blkio_mem_regions? */
c8c9135
     bool needs_mem_regions;
93330a9
-- 
93330a9
2.43.0
93330a9