[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/21] commit: Switch commit_populate() to byte-b
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v4 06/21] commit: Switch commit_populate() to byte-based |
Date: |
Wed, 5 Jul 2017 16:08:27 -0500 |
We are gradually converting to byte-based interfaces, as they are
easier to reason about than sector-based. Start by converting an
internal function (no semantic change).
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
---
v2: no change
---
block/commit.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/block/commit.c b/block/commit.c
index 4cda7f2..6f67d78 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -47,26 +47,25 @@ typedef struct CommitBlockJob {
} CommitBlockJob;
static int coroutine_fn commit_populate(BlockBackend *bs, BlockBackend *base,
- int64_t sector_num, int nb_sectors,
+ int64_t offset, uint64_t bytes,
void *buf)
{
int ret = 0;
QEMUIOVector qiov;
struct iovec iov = {
.iov_base = buf,
- .iov_len = nb_sectors * BDRV_SECTOR_SIZE,
+ .iov_len = bytes,
};
+ assert(bytes < SIZE_MAX);
qemu_iovec_init_external(&qiov, &iov, 1);
- ret = blk_co_preadv(bs, sector_num * BDRV_SECTOR_SIZE,
- qiov.size, &qiov, 0);
+ ret = blk_co_preadv(bs, offset, qiov.size, &qiov, 0);
if (ret < 0) {
return ret;
}
- ret = blk_co_pwritev(base, sector_num * BDRV_SECTOR_SIZE,
- qiov.size, &qiov, 0);
+ ret = blk_co_pwritev(base, offset, qiov.size, &qiov, 0);
if (ret < 0) {
return ret;
}
@@ -193,7 +192,9 @@ static void coroutine_fn commit_run(void *opaque)
trace_commit_one_iteration(s, sector_num * BDRV_SECTOR_SIZE,
n * BDRV_SECTOR_SIZE, ret);
if (copy) {
- ret = commit_populate(s->top, s->base, sector_num, n, buf);
+ ret = commit_populate(s->top, s->base,
+ sector_num * BDRV_SECTOR_SIZE,
+ n * BDRV_SECTOR_SIZE, buf);
bytes_written += n * BDRV_SECTOR_SIZE;
}
if (ret < 0) {
--
2.9.4
- [Qemu-devel] [PATCH v4 00/21] make bdrv_is_allocated[_above] byte-based, Eric Blake, 2017/07/05
- [Qemu-devel] [PATCH v4 04/21] stream: Drop reached_end for stream_complete(), Eric Blake, 2017/07/05
- [Qemu-devel] [PATCH v4 01/21] blockjob: Track job ratelimits via bytes, not sectors, Eric Blake, 2017/07/05
- [Qemu-devel] [PATCH v4 03/21] stream: Switch stream_populate() to byte-based, Eric Blake, 2017/07/05
- [Qemu-devel] [PATCH v4 07/21] commit: Switch commit_run() to byte-based, Eric Blake, 2017/07/05
- [Qemu-devel] [PATCH v4 10/21] mirror: Update signature of mirror_clip_sectors(), Eric Blake, 2017/07/05
- [Qemu-devel] [PATCH v4 06/21] commit: Switch commit_populate() to byte-based,
Eric Blake <=
- [Qemu-devel] [PATCH v4 02/21] trace: Show blockjob actions via bytes, not sectors, Eric Blake, 2017/07/05
- [Qemu-devel] [PATCH v4 05/21] stream: Switch stream_run() to byte-based, Eric Blake, 2017/07/05
- [Qemu-devel] [PATCH v4 08/21] mirror: Switch MirrorBlockJob to byte-based, Eric Blake, 2017/07/05
- [Qemu-devel] [PATCH v4 09/21] mirror: Switch mirror_do_zero_or_discard() to byte-based, Eric Blake, 2017/07/05
- [Qemu-devel] [PATCH v4 11/21] mirror: Switch mirror_cow_align() to byte-based, Eric Blake, 2017/07/05
- [Qemu-devel] [PATCH v4 12/21] mirror: Switch mirror_do_read() to byte-based, Eric Blake, 2017/07/05