Skip to contentSkip to conversation

block/blkio: Make s->mem_region_alignment be 64 bits

PATCH Applied Richard W.M. Jones 3 participants 3 messages Jan 30, 2024 – Feb 1, 2024 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 block/blkio: Make s->mem_region_alignment be 64 bits

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);
| ~~~~~~~~~~^~~~~

---
 block/blkio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
block/blkio.c +1 -1
index 0a0a6c0f5fd..bc2f21784c7 100644
@@ -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;
Signature · 1 line
2.43.0
#1 lore raw
Quoted 14 lines · Richard W.M. Jones

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);
| ~~~~~~~~~~^~~~~

Quoted 4 lines
---
 block/blkio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Thanks, applied to my block tree:
https://gitlab.com/stefanha/qemu/commits/block

Stefan

#2 lore raw
In reply to Richard W.M. Jones

30.01.2024 15:20, Richard W.M. Jones :

Quoted 24 lines

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);
       |                                                         ~~~~~~~~~~^~~~~
---
  block/blkio.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
block/blkio.c +0 -0
index 0a0a6c0f5fd..bc2f21784c7 100644

block/blkio.c typedef struct { · line 71

Quoted 5 lines
block/blkio.c +1 -1
@@ -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;

This seems like a stable material, is it not?

It's interesting gcc didn't warn about this one before, while it is clearly a type mismatch..

/mjt