[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 09/23] block: Switch BdrvCoGetBlockStatusData to
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v3 09/23] block: Switch BdrvCoGetBlockStatusData to byte-based |
Date: |
Thu, 13 Jul 2017 10:46:57 -0500 |
We are gradually converting to byte-based interfaces, as they are
easier to reason about than sector-based. Convert another internal
type (no semantic change), and rename it to match the corresponding
public function rename.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
---
v3: rebase to context conflicts, simple enough to keep R-b
v2: rebase to earlier changes
---
block/io.c | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/block/io.c b/block/io.c
index 6be3650..68d383d 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1676,17 +1676,17 @@ int bdrv_flush_all(void)
}
-typedef struct BdrvCoGetBlockStatusData {
+typedef struct BdrvCoBlockStatusData {
BlockDriverState *bs;
BlockDriverState *base;
BlockDriverState **file;
- int64_t sector_num;
- int nb_sectors;
- int *pnum;
+ int64_t offset;
+ int64_t bytes;
+ int64_t *pnum;
int64_t ret;
bool mapping;
bool done;
-} BdrvCoGetBlockStatusData;
+} BdrvCoBlockStatusData;
int64_t coroutine_fn bdrv_co_get_block_status_from_file(BlockDriverState *bs,
int64_t sector_num,
@@ -1917,14 +1917,16 @@ static int64_t coroutine_fn
bdrv_co_get_block_status_above(BlockDriverState *bs,
/* Coroutine wrapper for bdrv_get_block_status_above() */
static void coroutine_fn bdrv_get_block_status_above_co_entry(void *opaque)
{
- BdrvCoGetBlockStatusData *data = opaque;
+ BdrvCoBlockStatusData *data = opaque;
+ int n;
data->ret = bdrv_co_get_block_status_above(data->bs, data->base,
data->mapping,
- data->sector_num,
- data->nb_sectors,
- data->pnum,
+ data->offset >>
BDRV_SECTOR_BITS,
+ data->bytes >> BDRV_SECTOR_BITS,
+ &n,
data->file);
+ *data->pnum = n * BDRV_SECTOR_SIZE;
data->done = true;
}
@@ -1941,13 +1943,14 @@ static int64_t
bdrv_common_block_status_above(BlockDriverState *bs,
BlockDriverState **file)
{
Coroutine *co;
- BdrvCoGetBlockStatusData data = {
+ int64_t n;
+ BdrvCoBlockStatusData data = {
.bs = bs,
.base = base,
.file = file,
- .sector_num = sector_num,
- .nb_sectors = nb_sectors,
- .pnum = pnum,
+ .offset = sector_num * BDRV_SECTOR_SIZE,
+ .bytes = nb_sectors * BDRV_SECTOR_SIZE,
+ .pnum = &n,
.mapping = mapping,
.done = false,
};
@@ -1961,6 +1964,8 @@ static int64_t
bdrv_common_block_status_above(BlockDriverState *bs,
bdrv_coroutine_enter(bs, co);
BDRV_POLL_WHILE(bs, !data.done);
}
+ assert(data.ret < 0 || QEMU_IS_ALIGNED(n, BDRV_SECTOR_SIZE));
+ *pnum = n >> BDRV_SECTOR_BITS;
return data.ret;
}
--
2.9.4
- [Qemu-devel] [PATCH v3 00/23] make bdrv_get_block_status byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 02/23] block: Add flag to avoid wasted work in bdrv_is_allocated(), Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 01/23] block: Allow NULL file for bdrv_get_block_status(), Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 03/23] block: Make bdrv_round_to_clusters() signature more useful, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 05/23] block: Switch bdrv_make_zero() to byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 04/23] qcow2: Switch is_zero_sectors() to byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 06/23] qemu-img: Switch get_block_status() to byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 07/23] block: Convert bdrv_get_block_status() to bytes, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 09/23] block: Switch BdrvCoGetBlockStatusData to byte-based,
Eric Blake <=
- [Qemu-devel] [PATCH v3 10/23] block: Switch bdrv_common_block_status_above() to byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 11/23] block: Switch bdrv_co_get_block_status_above() to byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 08/23] block: Switch bdrv_co_get_block_status() to byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 12/23] block: Convert bdrv_get_block_status_above() to bytes, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 13/23] qemu-img: Simplify logic in img_compare(), Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 14/23] qemu-img: Speed up compare on pre-allocated larger file, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 15/23] qemu-img: Add find_nonzero(), Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 16/23] qemu-img: Drop redundant error message in compare, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 17/23] qemu-img: Change check_empty_sectors() to byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 18/23] qemu-img: Change compare_sectors() to be byte-based, Eric Blake, 2017/07/13