[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/17] commit: Switch commit_populate() to byte-base
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH 05/17] commit: Switch commit_populate() to byte-based |
Date: |
Tue, 11 Apr 2017 17:29:33 -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>
---
block/commit.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/block/commit.c b/block/commit.c
index 11dab98..d244c62 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;
}
@@ -179,7 +178,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.3
- [Qemu-devel] [PATCH 00/17] make bdrv_is_allocated[_above] byte-based, Eric Blake, 2017/04/11
- [Qemu-devel] [PATCH 01/17] blockjob: Track job ratelimits via bytes, not sectors, Eric Blake, 2017/04/11
- [Qemu-devel] [PATCH 03/17] stream: Switch stream_populate() to byte-based, Eric Blake, 2017/04/11
- [Qemu-devel] [PATCH 04/17] stream: Switch stream_run() to byte-based, Eric Blake, 2017/04/11
- [Qemu-devel] [PATCH 02/17] trace: Show blockjob actions via bytes, not sectors, Eric Blake, 2017/04/11
- [Qemu-devel] [PATCH 05/17] commit: Switch commit_populate() to byte-based,
Eric Blake <=
- [Qemu-devel] [PATCH 06/17] commit: Switch commit_run() to byte-based, Eric Blake, 2017/04/11
- [Qemu-devel] [PATCH 08/17] mirror: Switch mirror_do_zero_or_discard() to byte-based, Eric Blake, 2017/04/11
- [Qemu-devel] [PATCH 07/17] mirror: Switch MirrorBlockJob to byte-based, Eric Blake, 2017/04/11
- [Qemu-devel] [PATCH 09/17] mirror: Switch mirror_cow_align() to byte-based, Eric Blake, 2017/04/11
- [Qemu-devel] [PATCH 10/17] mirror: Switch mirror_do_read() to byte-based, Eric Blake, 2017/04/11
- [Qemu-devel] [PATCH 11/17] mirror: Switch mirror_iteration() to byte-based, Eric Blake, 2017/04/11
- [Qemu-devel] [PATCH 12/17] backup: Switch BackupBlockJob to byte-based, Eric Blake, 2017/04/11
- [Qemu-devel] [PATCH 15/17] backup: Switch backup_run() to byte-based, Eric Blake, 2017/04/11
- [Qemu-devel] [PATCH 14/17] backup: Switch backup_do_cow() to byte-based, Eric Blake, 2017/04/11
- [Qemu-devel] [PATCH 13/17] backup: Switch block_backup.h to byte-based, Eric Blake, 2017/04/11