[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 09/21] null: Switch to .bdrv_co_block_status()
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v8 09/21] null: Switch to .bdrv_co_block_status() |
Date: |
Tue, 13 Feb 2018 14:26:49 -0600 |
We are gradually moving away from sector-based interfaces, towards
byte-based. Update the null driver accordingly.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
---
v6-v7: no change
v5: minor fix to type of 'ret'
v4: rebase to interface tweak
v3: no change
v2: rebase to mapping parameter
---
block/null.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/block/null.c b/block/null.c
index 214d394fff4..806a8631e4d 100644
--- a/block/null.c
+++ b/block/null.c
@@ -223,22 +223,23 @@ static int null_reopen_prepare(BDRVReopenState
*reopen_state,
return 0;
}
-static int64_t coroutine_fn null_co_get_block_status(BlockDriverState *bs,
- int64_t sector_num,
- int nb_sectors, int *pnum,
- BlockDriverState **file)
+static int coroutine_fn null_co_block_status(BlockDriverState *bs,
+ bool want_zero, int64_t offset,
+ int64_t bytes, int64_t *pnum,
+ int64_t *map,
+ BlockDriverState **file)
{
BDRVNullState *s = bs->opaque;
- off_t start = sector_num * BDRV_SECTOR_SIZE;
+ int ret = BDRV_BLOCK_OFFSET_VALID;
- *pnum = nb_sectors;
+ *pnum = bytes;
+ *map = offset;
*file = bs;
if (s->read_zeroes) {
- return BDRV_BLOCK_OFFSET_VALID | start | BDRV_BLOCK_ZERO;
- } else {
- return BDRV_BLOCK_OFFSET_VALID | start;
+ ret |= BDRV_BLOCK_ZERO;
}
+ return ret;
}
static void null_refresh_filename(BlockDriverState *bs, QDict *opts)
@@ -270,7 +271,7 @@ static BlockDriver bdrv_null_co = {
.bdrv_co_flush_to_disk = null_co_flush,
.bdrv_reopen_prepare = null_reopen_prepare,
- .bdrv_co_get_block_status = null_co_get_block_status,
+ .bdrv_co_block_status = null_co_block_status,
.bdrv_refresh_filename = null_refresh_filename,
};
@@ -290,7 +291,7 @@ static BlockDriver bdrv_null_aio = {
.bdrv_aio_flush = null_aio_flush,
.bdrv_reopen_prepare = null_reopen_prepare,
- .bdrv_co_get_block_status = null_co_get_block_status,
+ .bdrv_co_block_status = null_co_block_status,
.bdrv_refresh_filename = null_refresh_filename,
};
--
2.14.3
- [Qemu-devel] [PATCH v8 00/21] add byte-based block_status driver callbacks, Eric Blake, 2018/02/13
- [Qemu-devel] [PATCH v8 02/21] nvme: Drop pointless .bdrv_co_get_block_status(), Eric Blake, 2018/02/13
- [Qemu-devel] [PATCH v8 06/21] iscsi: Switch cluster_sectors to byte-based, Eric Blake, 2018/02/13
- [Qemu-devel] [PATCH v8 04/21] file-posix: Switch to .bdrv_co_block_status(), Eric Blake, 2018/02/13
- [Qemu-devel] [PATCH v8 08/21] iscsi: Switch to .bdrv_co_block_status(), Eric Blake, 2018/02/13
- [Qemu-devel] [PATCH v8 09/21] null: Switch to .bdrv_co_block_status(),
Eric Blake <=
- Re: [Qemu-devel] [PATCH v8 09/21] null: Switch to .bdrv_co_block_status(), Kevin Wolf, 2018/02/14
- Re: [Qemu-devel] [PATCH v8 09/21] null: Switch to .bdrv_co_block_status(), Eric Blake, 2018/02/23
- Re: [Qemu-devel] [PATCH v8 09/21] null: Switch to .bdrv_co_block_status(), Kevin Wolf, 2018/02/23
- Re: [Qemu-devel] [PATCH v8 09/21] null: Switch to .bdrv_co_block_status(), Eric Blake, 2018/02/23
- Re: [Qemu-devel] [PATCH v8 09/21] null: Switch to .bdrv_co_block_status(), Kevin Wolf, 2018/02/26
[Qemu-devel] [PATCH v8 14/21] raw: Switch to .bdrv_co_block_status(), Eric Blake, 2018/02/13
[Qemu-devel] [PATCH v8 07/21] iscsi: Switch iscsi_allocmap_update() to byte-based, Eric Blake, 2018/02/13
[Qemu-devel] [PATCH v8 05/21] gluster: Switch to .bdrv_co_block_status(), Eric Blake, 2018/02/13