[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/20] qcow2: Switch to .bdrv_co_block_status()
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v2 11/20] qcow2: Switch to .bdrv_co_block_status() |
Date: |
Fri, 14 Jul 2017 07:14:48 -0500 |
We are gradually moving away from sector-based interfaces, towards
byte-based. Update the qcow2 driver accordingly.
For now, we are ignoring the 'mapping' hint. However, it should
be relatively straightforward to honor the hint as a way to return
larger *pnum values when we have consecutive clusters with the same
data/zero status but which differ only in having non-consecutive
mappings.
Signed-off-by: Eric Blake <address@hidden>
---
v2: rebase to mapping flag
---
block/qcow2.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index c30becf..bcdd212 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1637,8 +1637,12 @@ 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,
+ bool mapping,
+ int64_t offset,
+ int64_t count,
+ int64_t *pnum,
+ BlockDriverState **file)
{
BDRVQcow2State *s = bs->opaque;
uint64_t cluster_offset;
@@ -1646,21 +1650,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->crypto) {
- 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;
}
@@ -4295,7 +4298,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_co_preadv = qcow2_co_preadv,
.bdrv_co_pwritev = qcow2_co_pwritev,
--
2.9.4
- [Qemu-devel] [PATCH v2 01/20] block: Add .bdrv_co_block_status() callback, (continued)
- [Qemu-devel] [PATCH v2 01/20] block: Add .bdrv_co_block_status() callback, Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 02/20] block: Switch passthrough drivers to .bdrv_co_block_status(), Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 03/20] file-posix: Switch to .bdrv_co_block_status(), Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 04/20] gluster: Switch to .bdrv_co_block_status(), Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 05/20] iscsi: Switch cluster_sectors to byte-based, Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 08/20] null: Switch to .bdrv_co_block_status(), Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 07/20] iscsi: Switch to .bdrv_co_block_status(), Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 06/20] iscsi: Switch iscsi_allocmap_update() to byte-based, Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 09/20] parallels: Switch to .bdrv_co_block_status(), Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 10/20] qcow: Switch to .bdrv_co_block_status(), Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 11/20] qcow2: Switch to .bdrv_co_block_status(),
Eric Blake <=
- [Qemu-devel] [PATCH v2 12/20] qed: Switch to .bdrv_co_block_status(), Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 13/20] raw: Switch to .bdrv_co_block_status(), Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 14/20] sheepdog: Switch to .bdrv_co_block_status(), Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 15/20] vdi: Avoid bitrot of debugging code, Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 18/20] vpc: Switch to .bdrv_co_block_status(), Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 17/20] vmdk: Switch to .bdrv_co_block_status(), Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 16/20] vdi: Switch to .bdrv_co_block_status(), Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 19/20] vvfat: Switch to .bdrv_co_block_status(), Eric Blake, 2017/07/14
- [Qemu-devel] [PATCH v2 20/20] block: Drop unused .bdrv_co_get_block_status(), Eric Blake, 2017/07/14