[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 18/20] vpc: Switch to .bdrv_co_block_status()
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v3 18/20] vpc: Switch to .bdrv_co_block_status() |
Date: |
Thu, 14 Sep 2017 09:40:30 -0500 |
We are gradually moving away from sector-based interfaces, towards
byte-based. Update the vpc driver accordingly. Drop the now-unused
get_sector_offset().
Signed-off-by: Eric Blake <address@hidden>
---
v3: rebase to master
v2: drop get_sector_offset() [Kevin], rebase to mapping flag
---
block/vpc.c | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/block/vpc.c b/block/vpc.c
index 1576d7b595..2daa1db538 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -705,40 +705,42 @@ fail:
return ret;
}
-static int64_t coroutine_fn vpc_co_get_block_status(BlockDriverState *bs,
- int64_t sector_num, int nb_sectors, int *pnum, BlockDriverState **file)
+static int64_t coroutine_fn vpc_co_block_status(BlockDriverState *bs,
+ bool mapping,
+ int64_t offset, int64_t bytes,
+ int64_t *pnum,
+ BlockDriverState **file)
{
BDRVVPCState *s = bs->opaque;
VHDFooter *footer = (VHDFooter*) s->footer_buf;
- int64_t start, offset;
+ int64_t start, image_offset;
bool allocated;
int64_t ret;
int n;
if (be32_to_cpu(footer->type) == VHD_FIXED) {
- *pnum = nb_sectors;
+ *pnum = bytes;
*file = bs->file->bs;
return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID |
- (sector_num << BDRV_SECTOR_BITS);
+ (offset & BDRV_BLOCK_OFFSET_MASK);
}
qemu_co_mutex_lock(&s->lock);
- offset = get_image_offset(bs, sector_num << BDRV_SECTOR_BITS, false, NULL);
- start = offset;
- allocated = (offset != -1);
+ image_offset = get_image_offset(bs, offset, false, NULL);
+ start = image_offset & BDRV_BLOCK_OFFSET_MASK;
+ allocated = (image_offset != -1);
*pnum = 0;
ret = 0;
do {
/* All sectors in a block are contiguous (without using the bitmap) */
- n = ROUND_UP(sector_num + 1, s->block_size / BDRV_SECTOR_SIZE)
- - sector_num;
- n = MIN(n, nb_sectors);
+ n = ROUND_UP(offset + 1, s->block_size) - offset;
+ n = MIN(n, bytes);
*pnum += n;
- sector_num += n;
- nb_sectors -= n;
+ offset += n;
+ bytes -= n;
/* *pnum can't be greater than one block for allocated
* sectors since there is always a bitmap in between. */
if (allocated) {
@@ -746,11 +748,10 @@ static int64_t coroutine_fn
vpc_co_get_block_status(BlockDriverState *bs,
ret = BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | start;
break;
}
- if (nb_sectors == 0) {
+ if (bytes == 0) {
break;
}
- offset = get_image_offset(bs, sector_num << BDRV_SECTOR_BITS, false,
- NULL);
+ image_offset = get_image_offset(bs, offset, false, NULL);
} while (offset == -1);
qemu_co_mutex_unlock(&s->lock);
@@ -1097,7 +1098,7 @@ static BlockDriver bdrv_vpc = {
.bdrv_co_preadv = vpc_co_preadv,
.bdrv_co_pwritev = vpc_co_pwritev,
- .bdrv_co_get_block_status = vpc_co_get_block_status,
+ .bdrv_co_block_status = vpc_co_block_status,
.bdrv_get_info = vpc_get_info,
--
2.13.5
- [Qemu-devel] [PATCH v3 07/20] iscsi: Switch to .bdrv_co_block_status(), (continued)
- [Qemu-devel] [PATCH v3 07/20] iscsi: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-devel] [PATCH v3 10/20] qcow: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-devel] [PATCH v3 11/20] qcow2: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-devel] [PATCH v3 13/20] raw: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-devel] [PATCH v3 12/20] qed: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-devel] [PATCH v3 15/20] vdi: Avoid bitrot of debugging code, Eric Blake, 2017/09/14
- [Qemu-devel] [PATCH v3 14/20] sheepdog: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-devel] [PATCH v3 16/20] vdi: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-devel] [PATCH v3 19/20] vvfat: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-devel] [PATCH v3 17/20] vmdk: Switch to .bdrv_co_block_status(), Eric Blake, 2017/09/14
- [Qemu-devel] [PATCH v3 18/20] vpc: Switch to .bdrv_co_block_status(),
Eric Blake <=
- [Qemu-devel] [PATCH v3 20/20] block: Drop unused .bdrv_co_get_block_status(), Eric Blake, 2017/09/14