dec64939c6
- arm/virt: Fix vcpu hotplug idx_from_topo_ids - Revert patches related to the vSVA - sync some bugfix patches from upstream - add generic vDPA device support Signed-off-by: yezengruan <yezengruan@huawei.com> (cherry picked from commit b99dbfd9847104300672fb4f559f1c2abba8aa33)
46 lines
1.9 KiB
Diff
46 lines
1.9 KiB
Diff
From d319f43f223df53ed5c9c13c5b60caaa1b952c35 Mon Sep 17 00:00:00 2001
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 23 Nov 2022 06:26:18 +0000
|
|
Subject: [PATCH 08/29] virtio-mem: Don't skip alignment checks when warning
|
|
about block size mainline inclusion commit
|
|
7656d9ce09cb1d6d76eeb2081f164a920361d1d3 category: bugfix
|
|
|
|
---------------------------------------------------------------
|
|
|
|
If we warn about the block size being smaller than the default, we skip
|
|
some alignment checks.
|
|
|
|
This can currently only fail on x86-64, when specifying a block size of
|
|
1 MiB, however, we detect the THP size of 2 MiB.
|
|
|
|
Fixes: 228957fea3a9 ("virtio-mem: Probe THP size to determine default block size")
|
|
Cc: "Michael S. Tsirkin" <mst@redhat.com>
|
|
Signed-off-by: David Hildenbrand <david@redhat.com>
|
|
Message-Id: <20211011173305.13778-1-david@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
|
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/virtio/virtio-mem.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
|
|
index d5a578142b..341c3fa2c1 100644
|
|
--- a/hw/virtio/virtio-mem.c
|
|
+++ b/hw/virtio/virtio-mem.c
|
|
@@ -733,7 +733,8 @@ static void virtio_mem_device_realize(DeviceState *dev, Error **errp)
|
|
warn_report("'%s' property is smaller than the default block size (%"
|
|
PRIx64 " MiB)", VIRTIO_MEM_BLOCK_SIZE_PROP,
|
|
virtio_mem_default_block_size(rb) / MiB);
|
|
- } else if (!QEMU_IS_ALIGNED(vmem->requested_size, vmem->block_size)) {
|
|
+ }
|
|
+ if (!QEMU_IS_ALIGNED(vmem->requested_size, vmem->block_size)) {
|
|
error_setg(errp, "'%s' property has to be multiples of '%s' (0x%" PRIx64
|
|
")", VIRTIO_MEM_REQUESTED_SIZE_PROP,
|
|
VIRTIO_MEM_BLOCK_SIZE_PROP, vmem->block_size);
|
|
--
|
|
2.27.0
|
|
|