[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/35] block: Switch BdrvCoGetBlockStatusData to byte
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 11/35] block: Switch BdrvCoGetBlockStatusData to byte-based |
Date: |
Thu, 26 Oct 2017 15:17:17 +0200 |
From: Eric Blake <address@hidden>
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>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/io.c | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 file changed, 38 insertions(+), 18 deletions(-)
diff --git a/block/io.c b/block/io.c
index 1c4dc4b1a1..71d5f18d04 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1765,17 +1765,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,
@@ -2025,14 +2026,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;
}
@@ -2049,13 +2060,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,
};
@@ -2069,7 +2083,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-devel] [PULL 03/35] block: Allow NULL file for bdrv_get_block_status(), (continued)
- [Qemu-devel] [PULL 03/35] block: Allow NULL file for bdrv_get_block_status(), Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 04/35] block: Add flag to avoid wasted work in bdrv_is_allocated(), Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 07/35] block: Switch bdrv_make_zero() to byte-based, Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 09/35] block: Convert bdrv_get_block_status() to bytes, Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 06/35] qcow2: Switch is_zero_sectors() to byte-based, Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 08/35] qemu-img: Switch get_block_status() to byte-based, Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 05/35] block: Make bdrv_round_to_clusters() signature more useful, Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 12/35] block: Switch bdrv_common_block_status_above() to byte-based, Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 10/35] block: Switch bdrv_co_get_block_status() to byte-based, Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 15/35] qemu-img: Simplify logic in img_compare(), Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 11/35] block: Switch BdrvCoGetBlockStatusData to byte-based,
Kevin Wolf <=
- [Qemu-devel] [PULL 13/35] block: Switch bdrv_co_get_block_status_above() to byte-based, Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 16/35] qemu-img: Speed up compare on pre-allocated larger file, Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 14/35] block: Convert bdrv_get_block_status_above() to bytes, Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 18/35] qemu-img: Drop redundant error message in compare, Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 17/35] qemu-img: Add find_nonzero(), Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 19/35] qemu-img: Change check_empty_sectors() to byte-based, Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 22/35] qemu-img: Change img_compare() to be byte-based, Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 24/35] block: Reduce bdrv_aligned_preadv() rounding, Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 25/35] qcow2: Reduce is_zero() rounding, Kevin Wolf, 2017/10/26
- [Qemu-devel] [PULL 21/35] qemu-img: Change img_rebase() to be byte-based, Kevin Wolf, 2017/10/26