[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/3] virtio-mem: Correct format specifier mismatch for RISC-V
From: |
Michael S. Tsirkin |
Subject: |
[PULL 3/3] virtio-mem: Correct format specifier mismatch for RISC-V |
Date: |
Tue, 4 Aug 2020 10:17:12 -0400 |
From: Bruce Rogers <brogers@suse.com>
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>
---
hw/virtio/virtio-mem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index c12e9f79b0..7740fc613f 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
--
MST
- [PULL 0/3] virtio,acpi: bugfixes, Michael S. Tsirkin, 2020/08/04
- [PULL 2/3] arm/acpi: fix an out of spec _UID for PCI root, Michael S. Tsirkin, 2020/08/04
- [PULL 3/3] virtio-mem: Correct format specifier mismatch for RISC-V,
Michael S. Tsirkin <=
- [PULL 1/3] i386/acpi: fix inconsistent QEMU/OVMF device paths, Michael S. Tsirkin, 2020/08/04
- Re: [PULL 0/3] virtio,acpi: bugfixes, Peter Maydell, 2020/08/04
- Re: [PULL 0/3] virtio,acpi: bugfixes, Peter Maydell, 2020/08/04
- Re: [PULL 0/3] virtio,acpi: bugfixes, Michael S. Tsirkin, 2020/08/04