From: Stefan Hajnoczi Date: Tue, 23 Feb 2021 14:46:48 +0000 (+0000) Subject: block/export: fix blk_size double byteswap X-Git-Tag: v6.0.0~103^2~14 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a4f1542af58fd6ab061e594d4e161f1c8b4a4372;p=mirror_qemu.git block/export: fix blk_size double byteswap The config->blk_size field is little-endian. Use the native-endian blk_size variable to avoid double byteswapping. Fixes: 11f60f7eaee2630dd6fa0c3a8c49f792e46c4cf1 ("block/export: make vhost-user-blk config space little-endian") Signed-off-by: Stefan Hajnoczi Message-Id: <20210223144653.811468-8-stefanha@redhat.com> Signed-off-by: Kevin Wolf --- diff --git a/block/export/vhost-user-blk-server.c b/block/export/vhost-user-blk-server.c index ab2c4d44c4..7aea132f69 100644 --- a/block/export/vhost-user-blk-server.c +++ b/block/export/vhost-user-blk-server.c @@ -356,7 +356,7 @@ vu_blk_initialize_config(BlockDriverState *bs, config->num_queues = cpu_to_le16(num_queues); config->max_discard_sectors = cpu_to_le32(32768); config->max_discard_seg = cpu_to_le32(1); - config->discard_sector_alignment = cpu_to_le32(config->blk_size >> 9); + config->discard_sector_alignment = cpu_to_le32(blk_size >> 9); config->max_write_zeroes_sectors = cpu_to_le32(32768); config->max_write_zeroes_seg = cpu_to_le32(1); }