virtio-mem: Correct format specifier mismatch for RISC-V
PATCH 1/1 virtio-mem: Correct format specifier mismatch for RISC-V
This likely affects other, less popular host architectures as well. Less common host architectures under linux get QEMU_VMALLOC_ALIGN (from which VIRTIO_MEM_MIN_BLOCK_SIZE is derived) define to a variable of type uintptr, which isn't compatible with the format specifier used to print a user message. Since this particular usage of the underlying data seems unique to this file, the simple fix is to just cast QEMU_VMALLOC_ALIGN to uint32_t, which corresponds to the format specifier used.
--- hw/virtio/virtio-mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/virtio/virtio-mem.c +1 -1
@@ -36,7 +36,7 @@* Use QEMU_VMALLOC_ALIGN, so no THP will have to be split when unplugging * memory (e.g., 2MB on x86_64). */ -#define VIRTIO_MEM_MIN_BLOCK_SIZE QEMU_VMALLOC_ALIGN +#define VIRTIO_MEM_MIN_BLOCK_SIZE ((uint32_t)QEMU_VMALLOC_ALIGN)/* * Size the usable region bigger than the requested size if possible. Esp. * Linux guests will only add (aligned) memory blocks in case they fully
Signature · 1 line
2.27.0
Quoted 20 lines · Bruce Rogers
This likely affects other, less popular host architectures as well. Less common host architectures under linux get
QEMU_VMALLOC_ALIGN(from whichVIRTIO_MEM_MIN_BLOCK_SIZEis derived) define to a variable of type uintptr, which isn't compatible with the format specifier used to print a user message. Since this particular usage of the underlying data seems unique to this file, the simple fix is to just castQEMU_VMALLOC_ALIGNtouint32_t, which corresponds to the format specifier used.Signed-off-by Bruce Rogers <[email protected]>--- hw/virtio/virtio-mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/virtio/virtio-mem.c +0
-0
hw/virtio/virtio-mem.c line 42
Quoted 8 lines
hw/virtio/virtio-mem.c +1
-1@@ -36,7 +36,7 @@* Use QEMU_VMALLOC_ALIGN, so no THP will have to be split when unplugging * memory (e.g., 2MB on x86_64). */ -#define VIRTIO_MEM_MIN_BLOCK_SIZE QEMU_VMALLOC_ALIGN +#define VIRTIO_MEM_MIN_BLOCK_SIZE ((uint32_t)QEMU_VMALLOC_ALIGN)/* * Size the usable region bigger than the requested size if possible. Esp. * Linux guests will only add (aligned) memory blocks in case they fully
We should probably force that to always at least 1MB or so ... other discussion :)
Thanks (compile-tested on x86-64)!
Signature · 3 lines
Thanks, David / dhildenb
Quoted 30 lines · Bruce Rogers
This likely affects other, less popular host architectures as well. Less common host architectures under linux get
QEMU_VMALLOC_ALIGN(from whichVIRTIO_MEM_MIN_BLOCK_SIZEis derived) define to a variable of type uintptr, which isn't compatible with the format specifier used to print a user message. Since this particular usage of the underlying data seems unique to this file, the simple fix is to just castQEMU_VMALLOC_ALIGNtouint32_t, which corresponds to the format specifier used.Signed-off-by Bruce Rogers <[email protected]>--- hw/virtio/virtio-mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/virtio/virtio-mem.c +1
-1@@ -36,7 +36,7 @@* Use QEMU_VMALLOC_ALIGN, so no THP will have to be split when unplugging * memory (e.g., 2MB on x86_64). */ -#define VIRTIO_MEM_MIN_BLOCK_SIZE QEMU_VMALLOC_ALIGN +#define VIRTIO_MEM_MIN_BLOCK_SIZE ((uint32_t)QEMU_VMALLOC_ALIGN)/* * Size the usable region bigger than the requested size if possible. Esp. * Linux guests will only add (aligned) memory blocks in case they fully Signature · 1 line
2.27.0
Thanks,
Stefano
Quoted 19 lines
This likely affects other, less popular host architectures as well. Less common host architectures under linux get
QEMU_VMALLOC_ALIGN(from whichVIRTIO_MEM_MIN_BLOCK_SIZEis derived) define to a variable of type uintptr, which isn't compatible with the format specifier used to print a user message. Since this particular usage of the underlying data seems unique to this file, the simple fix is to just castQEMU_VMALLOC_ALIGNtouint32_t, which corresponds to the format specifier used.Signed-off-by Bruce Rogers <[email protected]>--- hw/virtio/virtio-mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/virtio/virtio-mem.c +0
-0
hw/virtio/virtio-mem.c line 42
Quoted 8 lines
hw/virtio/virtio-mem.c +1
-1@@ -36,7 +36,7 @@* Use QEMU_VMALLOC_ALIGN, so no THP will have to be split when unplugging * memory (e.g., 2MB on x86_64). */ -#define VIRTIO_MEM_MIN_BLOCK_SIZE QEMU_VMALLOC_ALIGN +#define VIRTIO_MEM_MIN_BLOCK_SIZE ((uint32_t)QEMU_VMALLOC_ALIGN)/* * Size the usable region bigger than the requested size if possible. Esp. * Linux guests will only add (aligned) memory blocks in case they fully