diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-08-04 16:51:32 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-08-04 16:51:32 +0100 |
| commit | 881419b7117d5350c2a0288bfb79f2a83715df32 (patch) | |
| tree | a1cf2041aeba24bea4ac0c03f1aeab1decc8c6e1 /hw | |
| parent | d15532d91be177e7528310e0110e39f915779a99 (diff) | |
| parent | facc68516a7ee6d4992dc47b42b47c600b20b21d (diff) | |
| download | qemu-881419b7117d5350c2a0288bfb79f2a83715df32.zip qemu-881419b7117d5350c2a0288bfb79f2a83715df32.tar.gz qemu-881419b7117d5350c2a0288bfb79f2a83715df32.tar.bz2 | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio: bugfix
A last minute bugfix.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Tue 04 Aug 2020 16:48:37 BST
# gpg: using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg: issuer "mst@redhat.com"
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream:
virtio-mem: Correct format specifier mismatch for RISC-V
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/virtio/virtio-mem.c | 2 |
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 |