[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 22/31] qcow2: Switch to .bdrv_co_block_status()
From: |
Eric Blake |
Subject: |
[Qemu-block] [PATCH 22/31] qcow2: Switch to .bdrv_co_block_status() |
Date: |
Mon, 17 Apr 2017 20:33:47 -0500 |
We are gradually moving away from sector-based interfaces, towards
byte-based. Update the qcow2 driver accordingly.
Signed-off-by: Eric Blake <address@hidden>
---
block/qcow2.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 4272cca..0de7210 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1358,8 +1358,8 @@ static void qcow2_join_options(QDict *options, QDict
*old_options)
}
}
-static int64_t coroutine_fn qcow2_co_get_block_status(BlockDriverState *bs,
- int64_t sector_num, int nb_sectors, int *pnum, BlockDriverState **file)
+static int64_t coroutine_fn qcow2_co_block_status(BlockDriverState *bs,
+ int64_t offset, int64_t count, int64_t *pnum, BlockDriverState **file)
{
BDRVQcow2State *s = bs->opaque;
uint64_t cluster_offset;
@@ -1367,21 +1367,20 @@ static int64_t coroutine_fn
qcow2_co_get_block_status(BlockDriverState *bs,
unsigned int bytes;
int64_t status = 0;
- bytes = MIN(INT_MAX, nb_sectors * BDRV_SECTOR_SIZE);
+ bytes = MIN(INT_MAX, count);
qemu_co_mutex_lock(&s->lock);
- ret = qcow2_get_cluster_offset(bs, sector_num << 9, &bytes,
- &cluster_offset);
+ ret = qcow2_get_cluster_offset(bs, offset, &bytes, &cluster_offset);
qemu_co_mutex_unlock(&s->lock);
if (ret < 0) {
return ret;
}
- *pnum = bytes >> BDRV_SECTOR_BITS;
+ *pnum = bytes;
if (cluster_offset != 0 && ret != QCOW2_CLUSTER_COMPRESSED &&
!s->cipher) {
- index_in_cluster = sector_num & (s->cluster_sectors - 1);
- cluster_offset |= (index_in_cluster << BDRV_SECTOR_BITS);
+ index_in_cluster = offset & (s->cluster_size - 1);
+ cluster_offset |= (index_in_cluster & BDRV_BLOCK_OFFSET_MASK);
*file = bs->file->bs;
status |= BDRV_BLOCK_OFFSET_VALID | cluster_offset;
}
@@ -3429,7 +3428,7 @@ BlockDriver bdrv_qcow2 = {
.bdrv_child_perm = bdrv_format_default_perms,
.bdrv_create = qcow2_create,
.bdrv_has_zero_init = bdrv_has_zero_init_1,
- .bdrv_co_get_block_status = qcow2_co_get_block_status,
+ .bdrv_co_block_status = qcow2_co_block_status,
.bdrv_set_key = qcow2_set_key,
.bdrv_co_preadv = qcow2_co_preadv,
--
2.9.3
- [Qemu-block] [PATCH 13/31] file-posix: Switch to .bdrv_co_block_status(), (continued)
- [Qemu-block] [PATCH 13/31] file-posix: Switch to .bdrv_co_block_status(), Eric Blake, 2017/04/17
- [Qemu-block] [PATCH 15/31] iscsi: Switch cluster_sectors to byte-based, Eric Blake, 2017/04/17
- [Qemu-block] [PATCH 16/31] iscsi: Switch iscsi_allocmap_update() to byte-based, Eric Blake, 2017/04/17
- [Qemu-block] [PATCH 17/31] iscsi: Switch to .bdrv_co_block_status(), Eric Blake, 2017/04/17
- [Qemu-block] [PATCH 18/31] mirror: Switch to .bdrv_co_block_status(), Eric Blake, 2017/04/17
- [Qemu-block] [PATCH 19/31] null: Switch to .bdrv_co_block_status(), Eric Blake, 2017/04/17
- [Qemu-block] [PATCH 20/31] parallels: Switch to .bdrv_co_block_status(), Eric Blake, 2017/04/17
- [Qemu-block] [PATCH 21/31] qcow: Switch to .bdrv_co_block_status(), Eric Blake, 2017/04/17
- [Qemu-block] [PATCH 22/31] qcow2: Switch to .bdrv_co_block_status(),
Eric Blake <=
- [Qemu-block] [PATCH 23/31] qed: Switch to .bdrv_co_block_status(), Eric Blake, 2017/04/17
- [Qemu-block] [PATCH 24/31] raw: Switch to .bdrv_co_block_status(), Eric Blake, 2017/04/17
- [Qemu-block] [PATCH 25/31] sheepdog: Switch to .bdrv_co_block_status(), Eric Blake, 2017/04/17
- [Qemu-block] [PATCH 26/31] vdi: Avoid bitrot of debugging code, Eric Blake, 2017/04/17
- [Qemu-block] [PATCH 27/31] vdi: Switch to .bdrv_co_block_status(), Eric Blake, 2017/04/17
- [Qemu-block] [PATCH 28/31] vmdk: Switch to .bdrv_co_block_status(), Eric Blake, 2017/04/17
- [Qemu-block] [PATCH 29/31] vpc: Switch to .bdrv_co_block_status(), Eric Blake, 2017/04/17
- [Qemu-block] [PATCH 30/31] vvfat: Switch to .bdrv_co_block_status(), Eric Blake, 2017/04/17
- [Qemu-block] [PATCH 31/31] block: Drop unused .bdrv_co_get_block_status(), Eric Blake, 2017/04/17