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

block/export: use VIRTIO_BLK_SECTOR_BITS

Browse Source 
Use VIRTIO_BLK_SECTOR_BITS and VIRTIO_BLK_SECTOR_SIZE when dealing with
virtio-blk sector numbers. Although the values happen to be the same as
BDRV_SECTOR_BITS and BDRV_SECTOR_SIZE, they are conceptually different.
This makes it clearer when we are dealing with virtio-blk sector units.

Use VIRTIO_BLK_SECTOR_BITS in vu_blk_initialize_config(). Later patches
will use it the new constants the virtqueue request processing code
path.

Suggested-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210223144653.811468-9-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2021-02-23 14:46:49 +00:00 committed by Kevin Wolf
parent a4f1542af5
commit 524bac0744
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,13 @@
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "util/block-helpers.h" #include "util/block-helpers.h"
/*
* Sector units are 512 bytes regardless of the
* virtio_blk_config->blk_size value.
*/
#define VIRTIO_BLK_SECTOR_BITS 9
#define VIRTIO_BLK_SECTOR_SIZE (1ull << VIRTIO_BLK_SECTOR_BITS)
enum { enum {
VHOST_USER_BLK_NUM_QUEUES_DEFAULT = 1, VHOST_USER_BLK_NUM_QUEUES_DEFAULT = 1,
}; };
@ -347,7 +354,8 @@ vu_blk_initialize_config(BlockDriverState *bs,
uint32_t blk_size, uint32_t blk_size,
uint16_t num_queues) uint16_t num_queues)
{ {
config->capacity = cpu_to_le64(bdrv_getlength(bs) >> BDRV_SECTOR_BITS); config->capacity =
cpu_to_le64(bdrv_getlength(bs) >> VIRTIO_BLK_SECTOR_BITS);
config->blk_size = cpu_to_le32(blk_size); config->blk_size = cpu_to_le32(blk_size);
config->size_max = cpu_to_le32(0); config->size_max = cpu_to_le32(0);
config->seg_max = cpu_to_le32(128 - 2); config->seg_max = cpu_to_le32(128 - 2);
@ -356,7 +364,8 @@ vu_blk_initialize_config(BlockDriverState *bs,
config->num_queues = cpu_to_le16(num_queues); config->num_queues = cpu_to_le16(num_queues);
config->max_discard_sectors = cpu_to_le32(32768); config->max_discard_sectors = cpu_to_le32(32768);
config->max_discard_seg = cpu_to_le32(1); config->max_discard_seg = cpu_to_le32(1);
config->discard_sector_alignment = cpu_to_le32(blk_size >> 9); config->discard_sector_alignment =
cpu_to_le32(blk_size >> VIRTIO_BLK_SECTOR_BITS);
config->max_write_zeroes_sectors = cpu_to_le32(32768); config->max_write_zeroes_sectors = cpu_to_le32(32768);
config->max_write_zeroes_seg = cpu_to_le32(1); config->max_write_zeroes_seg = cpu_to_le32(1);
} }
@ -383,7 +392,7 @@ static int vu_blk_exp_create(BlockExport *exp, BlockExportOptions *opts,
if (vu_opts->has_logical_block_size) { if (vu_opts->has_logical_block_size) {
logical_block_size = vu_opts->logical_block_size; logical_block_size = vu_opts->logical_block_size;
} else { } else {
logical_block_size = BDRV_SECTOR_SIZE; logical_block_size = VIRTIO_BLK_SECTOR_SIZE;
} }
check_block_size(exp->id, "logical-block-size", logical_block_size, check_block_size(exp->id, "logical-block-size", logical_block_size,
&local_err); &local_err);