[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[qemu-xen master] virtio-mem: Correct format specifier mismatch for RISC-V



commit facc68516a7ee6d4992dc47b42b47c600b20b21d
Author:     Bruce Rogers <brogers@xxxxxxxx>
AuthorDate: Thu Jul 30 07:05:19 2020 -0600
Commit:     Michael S. Tsirkin <mst@xxxxxxxxxx>
CommitDate: Tue Aug 4 11:48:17 2020 -0400

    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@xxxxxxxx>
    Message-Id: <20200730130519.168475-1-brogers@xxxxxxxx>
    Acked-by: David Hildenbrand <david@xxxxxxxxxx>
    Reviewed-by: Stefano Garzarella <sgarzare@xxxxxxxxxx>
    Reviewed-by: Pankaj Gupta <pankaj.gupta.linux@xxxxxxxxx>
---
 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
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.