[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 16/20] vdi: Switch to .bdrv_co_block_status()
From: |
Eric Blake |
Subject: |
[Qemu-block] [PATCH v4 16/20] vdi: Switch to .bdrv_co_block_status() |
Date: |
Thu, 12 Oct 2017 13:59:12 -0500 |
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 <address@hidden>
---
v4: rebase to interface tweak
v3: no change
v2: rebase to mapping flag
---
block/vdi.c | 33 +++++++++++++--------------------
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/block/vdi.c b/block/vdi.c
index 6f83221ddc..b30886823d 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -171,8 +171,6 @@ typedef struct {
uint32_t *bmap;
/* Size of block (bytes). */
uint32_t block_size;
- /* Size of block (sectors). */
- uint32_t block_sectors;
/* First sector of block map. */
uint32_t bmap_sector;
/* VDI header (converted to host endianness). */
@@ -462,7 +460,6 @@ static int vdi_open(BlockDriverState *bs, QDict *options,
int flags,
bs->total_sectors = header.disk_size / SECTOR_SIZE;
s->block_size = header.block_size;
- s->block_sectors = header.block_size / SECTOR_SIZE;
s->bmap_sector = header.offset_bmap / SECTOR_SIZE;
s->header = header;
@@ -508,33 +505,29 @@ static int vdi_reopen_prepare(BDRVReopenState *state,
return 0;
}
-static int64_t coroutine_fn vdi_co_get_block_status(BlockDriverState *bs,
- int64_t sector_num, int nb_sectors, int *pnum, BlockDriverState **file)
+static int coroutine_fn vdi_co_block_status(BlockDriverState *bs,
+ 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;
- size_t bmap_index = sector_num / s->block_sectors;
- size_t sector_in_block = sector_num % s->block_sectors;
- int n_sectors = s->block_sectors - sector_in_block;
+ size_t bmap_index = offset / s->block_size;
+ size_t index_in_block = offset % s->block_size;
uint32_t bmap_entry = le32_to_cpu(s->bmap[bmap_index]);
- uint64_t offset;
int result;
- logout("%p, %" PRId64 ", %d, %p\n", bs, sector_num, nb_sectors, pnum);
- if (n_sectors > nb_sectors) {
- n_sectors = nb_sectors;
- }
- *pnum = n_sectors;
+ logout("%p, %" PRId64 ", %" PRId64 ", %p\n", bs, offset, bytes, pnum);
+ *pnum = MIN(s->block_size, bytes);
result = VDI_IS_ALLOCATED(bmap_entry);
if (!result) {
return 0;
}
- offset = s->header.offset_data +
- (uint64_t)bmap_entry * s->block_size +
- sector_in_block * SECTOR_SIZE;
+ *map = s->header.offset_data + (uint64_t)bmap_entry * s->block_size +
+ index_in_block;
*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
@@ -902,7 +895,7 @@ static BlockDriver bdrv_vdi = {
.bdrv_child_perm = bdrv_format_default_perms,
.bdrv_create = vdi_create,
.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_co_preadv = vdi_co_preadv,
--
2.13.6
- [Qemu-block] [PATCH v4 07/20] iscsi: Switch to .bdrv_co_block_status(), (continued)
- [Qemu-block] [PATCH v4 07/20] iscsi: Switch to .bdrv_co_block_status(), Eric Blake, 2017/10/12
- [Qemu-block] [PATCH v4 08/20] null: Switch to .bdrv_co_block_status(), Eric Blake, 2017/10/12
- [Qemu-block] [PATCH v4 09/20] parallels: Switch to .bdrv_co_block_status(), Eric Blake, 2017/10/12
- [Qemu-block] [PATCH v4 10/20] qcow: Switch to .bdrv_co_block_status(), Eric Blake, 2017/10/12
- [Qemu-block] [PATCH v4 11/20] qcow2: Switch to .bdrv_co_block_status(), Eric Blake, 2017/10/12
- [Qemu-block] [PATCH v4 12/20] qed: Switch to .bdrv_co_block_status(), Eric Blake, 2017/10/12
- [Qemu-block] [PATCH v4 13/20] raw: Switch to .bdrv_co_block_status(), Eric Blake, 2017/10/12
- [Qemu-block] [PATCH v4 14/20] sheepdog: Switch to .bdrv_co_block_status(), Eric Blake, 2017/10/12
- [Qemu-block] [PATCH v4 15/20] vdi: Avoid bitrot of debugging code, Eric Blake, 2017/10/12
- [Qemu-block] [PATCH v4 16/20] vdi: Switch to .bdrv_co_block_status(),
Eric Blake <=
- [Qemu-block] [PATCH v4 17/20] vmdk: Switch to .bdrv_co_block_status(), Eric Blake, 2017/10/12
- [Qemu-block] [PATCH v4 18/20] vpc: Switch to .bdrv_co_block_status(), Eric Blake, 2017/10/12
- [Qemu-block] [PATCH v4 19/20] vvfat: Switch to .bdrv_co_block_status(), Eric Blake, 2017/10/12
- [Qemu-block] [PATCH v4 20/20] block: Drop unused .bdrv_co_get_block_status(), Eric Blake, 2017/10/12