[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 20/31] parallels: Switch to .bdrv_co_block_status()
From: |
Eric Blake |
Subject: |
[Qemu-block] [PATCH 20/31] parallels: Switch to .bdrv_co_block_status() |
Date: |
Mon, 17 Apr 2017 20:33:45 -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.
Signed-off-by: Eric Blake <address@hidden>
---
block/parallels.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 8be46a7..2bc1918 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -274,22 +274,25 @@ 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,
+ 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;
}
@@ -775,7 +778,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.3
- Re: [Qemu-block] [PATCH 14/31] gluster: 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 <=
- [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, 2017/04/17
- [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