aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Rogers <brogers@suse.com>2020-07-30 07:05:19 -0600
committerMichael S. Tsirkin <mst@redhat.com>2020-08-04 11:48:17 -0400
commitfacc68516a7ee6d4992dc47b42b47c600b20b21d (patch)
tree151360c07220ba7156a19d613d4272d4dff6361f
parent5c1c3e4f02e458cf280c677c817ae4fd1ed9bf10 (diff)
downloadqemu-facc68516a7ee6d4992dc47b42b47c600b20b21d.zip
qemu-facc68516a7ee6d4992dc47b42b47c600b20b21d.tar.gz
qemu-facc68516a7ee6d4992dc47b42b47c600b20b21d.tar.bz2
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. Signed-off-by: Bruce Rogers <brogers@suse.com> Message-Id: <20200730130519.168475-1-brogers@suse.com> Acked-by: David Hildenbrand <david@redhat.com> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> Reviewed-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
-rw-r--r--hw/virtio/virtio-mem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index c12e9f7..7740fc6 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -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