[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/20] parallels: Switch to .bdrv_co_block_status
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v2 09/20] parallels: Switch to .bdrv_co_block_status() |
Date: |
Fri, 14 Jul 2017 07:14:46 -0500 |
We are gradually moving away from sector-based interfaces, towards
byte-based. Update the parallels driver accordingly. Note that
the internal function block_status() is still sector-based, because
it is still in use by other sector-based functions; but that's okay
because request_alignment is 512 as a result of those functions.
For now, no optimizations are added based on the mapping hint.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
---
v2: rebase to mapping parameter; it is ignored, so R-b kept
---
block/parallels.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 5bbdfab..8aaacea 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -274,22 +274,29 @@ static coroutine_fn int
parallels_co_flush_to_os(BlockDriverState *bs)
}
-static int64_t coroutine_fn parallels_co_get_block_status(BlockDriverState *bs,
- int64_t sector_num, int nb_sectors, int *pnum, BlockDriverState **file)
+static int64_t coroutine_fn parallels_co_block_status(BlockDriverState *bs,
+ bool mapping,
+ int64_t offset,
+ int64_t bytes,
+ int64_t *pnum,
+ BlockDriverState **file)
{
BDRVParallelsState *s = bs->opaque;
- int64_t offset;
+ int count;
+ assert(QEMU_IS_ALIGNED(offset | bytes, BDRV_SECTOR_SIZE));
qemu_co_mutex_lock(&s->lock);
- offset = block_status(s, sector_num, nb_sectors, pnum);
+ offset = block_status(s, offset >> BDRV_SECTOR_BITS,
+ bytes >> BDRV_SECTOR_BITS, &count);
qemu_co_mutex_unlock(&s->lock);
if (offset < 0) {
return 0;
}
+ *pnum = count * BDRV_SECTOR_SIZE;
*file = bs->file->bs;
- return (offset << BDRV_SECTOR_BITS) |
+ return (offset & BDRV_BLOCK_OFFSET_MASK) |
BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID;
}
@@ -778,7 +785,7 @@ static BlockDriver bdrv_parallels = {
.bdrv_open = parallels_open,
.bdrv_close = parallels_close,
.bdrv_child_perm = bdrv_format_default_perms,
- .bdrv_co_get_block_status = parallels_co_get_block_status,
+ .bdrv_co_block_status = parallels_co_block_status,
.bdrv_has_zero_init = bdrv_has_zero_init_1,
.bdrv_co_flush_to_os = parallels_co_flush_to_os,
.bdrv_co_readv = parallels_co_readv,
--
2.9.4
- [Qemu-devel] [PATCH v2 00/20] add byte-based block_status driver callbacks, Eric Blake, 2017/07/14
- [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 <=
- [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, 2017/07/14
- [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