[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v6 09/24] block: Switch BdrvCoGetBlockStatusData to
From: |
Eric Blake |
Subject: |
[Qemu-block] [PATCH v6 09/24] block: Switch BdrvCoGetBlockStatusData to byte-based |
Date: |
Wed, 11 Oct 2017 22:47:05 -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>
---
v6: fix -O2 compilation [Jeff], rebase to split return interface
change [Kevin], drop R-b
v4-v5: no change
v3: rebase to context conflicts, simple enough to keep R-b
v2: rebase to earlier changes
---
block/io.c | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 file changed, 38 insertions(+), 18 deletions(-)
diff --git a/block/io.c b/block/io.c
index 5805929ef0..da600a8dc3 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1745,17 +1745,18 @@ int bdrv_flush_all(void)
}
-typedef struct BdrvCoGetBlockStatusData {
+typedef struct BdrvCoBlockStatusData {
BlockDriverState *bs;
BlockDriverState *base;
bool want_zero;
- int64_t sector_num;
- int nb_sectors;
- int *pnum;
+ int64_t offset;
+ int64_t bytes;
+ int64_t *pnum;
+ int64_t *map;
BlockDriverState **file;
- int64_t ret;
+ int ret;
bool done;
-} BdrvCoGetBlockStatusData;
+} BdrvCoBlockStatusData;
int64_t coroutine_fn bdrv_co_get_block_status_from_file(BlockDriverState *bs,
int64_t sector_num,
@@ -2005,14 +2006,24 @@ 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 = 0;
+ int64_t ret;
- data->ret = bdrv_co_get_block_status_above(data->bs, data->base,
- data->want_zero,
- data->sector_num,
- data->nb_sectors,
- data->pnum,
- data->file);
+ ret = bdrv_co_get_block_status_above(data->bs, data->base,
+ data->want_zero,
+ data->offset >> BDRV_SECTOR_BITS,
+ data->bytes >> BDRV_SECTOR_BITS,
+ &n,
+ data->file);
+ if (ret < 0) {
+ assert(INT_MIN <= ret);
+ data->ret = ret;
+ } else {
+ *data->pnum = n * BDRV_SECTOR_SIZE;
+ *data->map = ret & BDRV_BLOCK_OFFSET_MASK;
+ data->ret = ret & ~BDRV_BLOCK_OFFSET_MASK;
+ }
data->done = true;
}
@@ -2029,13 +2040,16 @@ static int64_t
bdrv_common_block_status_above(BlockDriverState *bs,
BlockDriverState **file)
{
Coroutine *co;
- BdrvCoGetBlockStatusData data = {
+ int64_t n;
+ int64_t map;
+ BdrvCoBlockStatusData data = {
.bs = bs,
.base = base,
.want_zero = want_zero,
- .sector_num = sector_num,
- .nb_sectors = nb_sectors,
- .pnum = pnum,
+ .offset = sector_num * BDRV_SECTOR_SIZE,
+ .bytes = nb_sectors * BDRV_SECTOR_SIZE,
+ .pnum = &n,
+ .map = &map,
.file = file,
.done = false,
};
@@ -2049,7 +2063,13 @@ static int64_t
bdrv_common_block_status_above(BlockDriverState *bs,
bdrv_coroutine_enter(bs, co);
BDRV_POLL_WHILE(bs, !data.done);
}
- return data.ret;
+ if (data.ret < 0) {
+ *pnum = 0;
+ return data.ret;
+ }
+ assert(QEMU_IS_ALIGNED(n | map, BDRV_SECTOR_SIZE));
+ *pnum = n >> BDRV_SECTOR_BITS;
+ return data.ret | map;
}
int64_t bdrv_get_block_status_above(BlockDriverState *bs,
--
2.13.6
- [Qemu-block] [PATCH v6 02/24] block: Add flag to avoid wasted work in bdrv_is_allocated(), (continued)
- [Qemu-block] [PATCH v6 02/24] block: Add flag to avoid wasted work in bdrv_is_allocated(), Eric Blake, 2017/10/11
- [Qemu-block] [PATCH v6 03/24] block: Make bdrv_round_to_clusters() signature more useful, Eric Blake, 2017/10/11
- [Qemu-block] [PATCH v6 04/24] qcow2: Switch is_zero_sectors() to byte-based, Eric Blake, 2017/10/11
- [Qemu-block] [PATCH v6 05/24] block: Switch bdrv_make_zero() to byte-based, Eric Blake, 2017/10/11
- [Qemu-block] [PATCH v6 06/24] qemu-img: Switch get_block_status() to byte-based, Eric Blake, 2017/10/11
- [Qemu-block] [PATCH v6 07/24] block: Convert bdrv_get_block_status() to bytes, Eric Blake, 2017/10/11
- [Qemu-block] [PATCH v6 08/24] block: Switch bdrv_co_get_block_status() to byte-based, Eric Blake, 2017/10/11
- [Qemu-block] [PATCH v6 09/24] block: Switch BdrvCoGetBlockStatusData to byte-based,
Eric Blake <=
- [Qemu-block] [PATCH v6 10/24] block: Switch bdrv_common_block_status_above() to byte-based, Eric Blake, 2017/10/11
- [Qemu-block] [PATCH v6 11/24] block: Switch bdrv_co_get_block_status_above() to byte-based, Eric Blake, 2017/10/11
- [Qemu-block] [PATCH v6 12/24] block: Convert bdrv_get_block_status_above() to bytes, Eric Blake, 2017/10/11
[Qemu-block] [PATCH v6 13/24] qemu-img: Simplify logic in img_compare(), Eric Blake, 2017/10/11
[Qemu-block] [PATCH v6 15/24] qemu-img: Add find_nonzero(), Eric Blake, 2017/10/11
[Qemu-block] [PATCH v6 14/24] qemu-img: Speed up compare on pre-allocated larger file, Eric Blake, 2017/10/11
[Qemu-block] [PATCH v6 16/24] qemu-img: Drop redundant error message in compare, Eric Blake, 2017/10/11