On 11.10.21 19:33, David Hildenbrand wrote:
> 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" <m...@redhat.com>
> Signed-off-by: David Hildenbrand <da...@redhat.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 df91e454b2..7ce9901791 100644
> --- a/hw/virtio/virtio-mem.c
> +++ b/hw/virtio/virtio-mem.c
> @@ -701,7 +701,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);
>
Ping, this already missed the v6.2 release ...
--
Thanks,
David / dhildenb
