mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block/export: make vhost-user-blk config space little-endian

Browse Source 
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>
Message-Id: <20201027173528.213464-4-stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2020-10-27 17:35:19 +00:00 committed by Michael S. Tsirkin
parent bc15e44cb2
commit 11f60f7eae
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
block/export/vhost-user-blk-server.c
View File

@ -264,7 +264,6 @@ static uint64_t vu_blk_get_protocol_features(VuDev *dev)
static int static int
vu_blk_get_config(VuDev *vu_dev, uint8_t *config, uint32_t len) 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); VuServer *server = container_of(vu_dev, VuServer, vu_dev);
VuBlkExport *vexp = container_of(server, VuBlkExport, vu_server); VuBlkExport *vexp = container_of(server, VuBlkExport, vu_server);
memcpy(config, &vexp->blkcfg, len); memcpy(config, &vexp->blkcfg, len);
@ -343,18 +342,18 @@ vu_blk_initialize_config(BlockDriverState *bs,
uint32_t blk_size, uint32_t blk_size,
uint16_t num_queues) uint16_t num_queues)
{ {
config->capacity = bdrv_getlength(bs) >> BDRV_SECTOR_BITS; config->capacity = cpu_to_le64(bdrv_getlength(bs) >> BDRV_SECTOR_BITS);
config->blk_size = blk_size; config->blk_size = cpu_to_le32(blk_size);
config->size_max = 0; config->size_max = cpu_to_le32(0);
config->seg_max = 128 - 2; config->seg_max = cpu_to_le32(128 - 2);
config->min_io_size = 1; config->min_io_size = cpu_to_le16(1);
config->opt_io_size = 1; config->opt_io_size = cpu_to_le32(1);
config->num_queues = num_queues; config->num_queues = cpu_to_le16(num_queues);
config->max_discard_sectors = 32768; config->max_discard_sectors = cpu_to_le32(32768);
config->max_discard_seg = 1; config->max_discard_seg = cpu_to_le32(1);
config->discard_sector_alignment = config->blk_size >> 9; config->discard_sector_alignment = cpu_to_le32(config->blk_size >> 9);
config->max_write_zeroes_sectors = 32768; config->max_write_zeroes_sectors = cpu_to_le32(32768);
config->max_write_zeroes_seg = 1; config->max_write_zeroes_seg = cpu_to_le32(1);
} }
static void vu_blk_exp_request_shutdown(BlockExport *exp) static void vu_blk_exp_request_shutdown(BlockExport *exp)