[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/12] block/export: make vhost-user-blk config space little-endi
From: |
Stefan Hajnoczi |
Subject: |
[PATCH 03/12] block/export: make vhost-user-blk config space little-endian |
Date: |
Tue, 27 Oct 2020 17:35:19 +0000 |
VIRTIO 1.0 devices have little-endian configuration space. The
vhost-user-blk-server.c code already uses little-endian for virtqueue
processing but not for the configuration space fields. Fix this so the
vhost-user-blk export works on big-endian hosts.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
block/export/vhost-user-blk-server.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/block/export/vhost-user-blk-server.c
b/block/export/vhost-user-blk-server.c
index 41f4933d6e..33cc0818b8 100644
--- a/block/export/vhost-user-blk-server.c
+++ b/block/export/vhost-user-blk-server.c
@@ -264,7 +264,6 @@ static uint64_t vu_blk_get_protocol_features(VuDev *dev)
static int
vu_blk_get_config(VuDev *vu_dev, uint8_t *config, uint32_t len)
{
- /* TODO blkcfg must be little-endian for VIRTIO 1.0 */
VuServer *server = container_of(vu_dev, VuServer, vu_dev);
VuBlkExport *vexp = container_of(server, VuBlkExport, vu_server);
memcpy(config, &vexp->blkcfg, len);
@@ -343,18 +342,18 @@ vu_blk_initialize_config(BlockDriverState *bs,
uint32_t blk_size,
uint16_t num_queues)
{
- config->capacity = bdrv_getlength(bs) >> BDRV_SECTOR_BITS;
- config->blk_size = blk_size;
- config->size_max = 0;
- config->seg_max = 128 - 2;
- config->min_io_size = 1;
- config->opt_io_size = 1;
- config->num_queues = num_queues;
- config->max_discard_sectors = 32768;
- config->max_discard_seg = 1;
- config->discard_sector_alignment = config->blk_size >> 9;
- config->max_write_zeroes_sectors = 32768;
- config->max_write_zeroes_seg = 1;
+ config->capacity = cpu_to_le64(bdrv_getlength(bs) >> BDRV_SECTOR_BITS);
+ config->blk_size = cpu_to_le32(blk_size);
+ config->size_max = cpu_to_le32(0);
+ config->seg_max = cpu_to_le32(128 - 2);
+ config->min_io_size = cpu_to_le16(1);
+ config->opt_io_size = cpu_to_le32(1);
+ 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->max_write_zeroes_sectors = cpu_to_le32(32768);
+ config->max_write_zeroes_seg = cpu_to_le32(1);
}
static void vu_blk_exp_request_shutdown(BlockExport *exp)
--
2.26.2
- [PATCH 00/12] block/export: vhost-user-blk server cleanups and tests, Stefan Hajnoczi, 2020/10/27
- [PATCH 01/12] libvhost-user: follow QEMU comment style, Stefan Hajnoczi, 2020/10/27
- [PATCH 03/12] block/export: make vhost-user-blk config space little-endian,
Stefan Hajnoczi <=
- [PATCH 02/12] configure: introduce --enable-vhost-user-blk-server, Stefan Hajnoczi, 2020/10/27
- [PATCH 05/12] contrib/vhost-user-blk: fix get_config() information leak, Stefan Hajnoczi, 2020/10/27
- [PATCH 04/12] block/export: fix vhost-user-blk get_config() information leak, Stefan Hajnoczi, 2020/10/27
- [PATCH 10/12] vhost-user-blk-test: close fork child file descriptors, Stefan Hajnoczi, 2020/10/27
- [PATCH 07/12] tests/qtest: add multi-queue test case to vhost-user-blk-test, Stefan Hajnoczi, 2020/10/27
- [PATCH 09/12] vhost-user-blk-test: rename destroy_drive() to destroy_file(), Stefan Hajnoczi, 2020/10/27
- [PATCH 08/12] libqtest: add qtest_socket_server(), Stefan Hajnoczi, 2020/10/27
- [PATCH 06/12] test: new qTest case to test the vhost-user-blk-server, Stefan Hajnoczi, 2020/10/27
- [PATCH 11/12] vhost-user-blk-test: drop unused return value, Stefan Hajnoczi, 2020/10/27
- [PATCH 12/12] vhost-user-blk-test: fix races by using fd passing, Stefan Hajnoczi, 2020/10/27