45 lines
1.9 KiB
Diff
45 lines
1.9 KiB
Diff
|
From 29c5b94ae259f21b792a611096c60b240e0c0983 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
Date: Mon, 15 Mar 2021 18:16:25 -0400
|
||
|
|
Subject: [PATCH 09/15] block/export: fix blk_size double byteswap
|
||
|
|
|
||
|
|
RH-Author: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
Message-id: <20210315181629.212884-3-stefanha@redhat.com>
|
||
|
|
Patchwork-id: 101340
|
||
|
|
O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH 2/6] block/export: fix blk_size double byteswap
|
||
|
|
Bugzilla: 1937004
|
||
|
|
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
||
|
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
||
|
|
|
||
|
|
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 <stefanha@redhat.com>
|
||
|
|
Message-Id: <20210223144653.811468-8-stefanha@redhat.com>
|
||
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
(cherry picked from commit a4f1542af58fd6ab061e594d4e161f1c8b4a4372)
|
||
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
block/export/vhost-user-blk-server.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/block/export/vhost-user-blk-server.c b/block/export/vhost-user-blk-server.c
|
||
|
|
index 62672d1cb9..3003cff189 100644
|
||
|
|
--- a/block/export/vhost-user-blk-server.c
|
||
|
|
+++ b/block/export/vhost-user-blk-server.c
|
||
|
|
@@ -354,7 +354,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);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|