vdi: Switch to .bdrv_co_block_status()
We are gradually moving away from sector-based interfaces, towards byte-based. Update the vdi driver accordingly. Note that the TODO is already covered (the block layer guarantees bounds of its requests), and that we can remove the now-unused s->block_sectors. Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Fam Zheng <famz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
b80666bf84
commit
67635f6abe
33
block/vdi.c
33
block/vdi.c
|
@ -172,8 +172,6 @@ typedef struct {
|
||||||
uint32_t *bmap;
|
uint32_t *bmap;
|
||||||
/* Size of block (bytes). */
|
/* Size of block (bytes). */
|
||||||
uint32_t block_size;
|
uint32_t block_size;
|
||||||
/* Size of block (sectors). */
|
|
||||||
uint32_t block_sectors;
|
|
||||||
/* First sector of block map. */
|
/* First sector of block map. */
|
||||||
uint32_t bmap_sector;
|
uint32_t bmap_sector;
|
||||||
/* VDI header (converted to host endianness). */
|
/* VDI header (converted to host endianness). */
|
||||||
|
@ -463,7 +461,6 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags,
|
||||||
bs->total_sectors = header.disk_size / SECTOR_SIZE;
|
bs->total_sectors = header.disk_size / SECTOR_SIZE;
|
||||||
|
|
||||||
s->block_size = header.block_size;
|
s->block_size = header.block_size;
|
||||||
s->block_sectors = header.block_size / SECTOR_SIZE;
|
|
||||||
s->bmap_sector = header.offset_bmap / SECTOR_SIZE;
|
s->bmap_sector = header.offset_bmap / SECTOR_SIZE;
|
||||||
s->header = header;
|
s->header = header;
|
||||||
|
|
||||||
|
@ -509,33 +506,29 @@ static int vdi_reopen_prepare(BDRVReopenState *state,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int64_t coroutine_fn vdi_co_get_block_status(BlockDriverState *bs,
|
static int coroutine_fn vdi_co_block_status(BlockDriverState *bs,
|
||||||
int64_t sector_num, int nb_sectors, int *pnum, BlockDriverState **file)
|
bool want_zero,
|
||||||
|
int64_t offset, int64_t bytes,
|
||||||
|
int64_t *pnum, int64_t *map,
|
||||||
|
BlockDriverState **file)
|
||||||
{
|
{
|
||||||
/* TODO: Check for too large sector_num (in bdrv_is_allocated or here). */
|
|
||||||
BDRVVdiState *s = (BDRVVdiState *)bs->opaque;
|
BDRVVdiState *s = (BDRVVdiState *)bs->opaque;
|
||||||
size_t bmap_index = sector_num / s->block_sectors;
|
size_t bmap_index = offset / s->block_size;
|
||||||
size_t sector_in_block = sector_num % s->block_sectors;
|
size_t index_in_block = offset % s->block_size;
|
||||||
int n_sectors = s->block_sectors - sector_in_block;
|
|
||||||
uint32_t bmap_entry = le32_to_cpu(s->bmap[bmap_index]);
|
uint32_t bmap_entry = le32_to_cpu(s->bmap[bmap_index]);
|
||||||
uint64_t offset;
|
|
||||||
int result;
|
int result;
|
||||||
|
|
||||||
logout("%p, %" PRId64 ", %d, %p\n", bs, sector_num, nb_sectors, pnum);
|
logout("%p, %" PRId64 ", %" PRId64 ", %p\n", bs, offset, bytes, pnum);
|
||||||
if (n_sectors > nb_sectors) {
|
*pnum = MIN(s->block_size - index_in_block, bytes);
|
||||||
n_sectors = nb_sectors;
|
|
||||||
}
|
|
||||||
*pnum = n_sectors;
|
|
||||||
result = VDI_IS_ALLOCATED(bmap_entry);
|
result = VDI_IS_ALLOCATED(bmap_entry);
|
||||||
if (!result) {
|
if (!result) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
offset = s->header.offset_data +
|
*map = s->header.offset_data + (uint64_t)bmap_entry * s->block_size +
|
||||||
(uint64_t)bmap_entry * s->block_size +
|
index_in_block;
|
||||||
sector_in_block * SECTOR_SIZE;
|
|
||||||
*file = bs->file->bs;
|
*file = bs->file->bs;
|
||||||
return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | offset;
|
return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int coroutine_fn
|
static int coroutine_fn
|
||||||
|
@ -903,7 +896,7 @@ static BlockDriver bdrv_vdi = {
|
||||||
.bdrv_child_perm = bdrv_format_default_perms,
|
.bdrv_child_perm = bdrv_format_default_perms,
|
||||||
.bdrv_create = vdi_create,
|
.bdrv_create = vdi_create,
|
||||||
.bdrv_has_zero_init = bdrv_has_zero_init_1,
|
.bdrv_has_zero_init = bdrv_has_zero_init_1,
|
||||||
.bdrv_co_get_block_status = vdi_co_get_block_status,
|
.bdrv_co_block_status = vdi_co_block_status,
|
||||||
.bdrv_make_empty = vdi_make_empty,
|
.bdrv_make_empty = vdi_make_empty,
|
||||||
|
|
||||||
.bdrv_co_preadv = vdi_co_preadv,
|
.bdrv_co_preadv = vdi_co_preadv,
|
||||||
|
|
Loading…
Reference in a new issue