提交 d8a98584 编写于 作者: E Eric Blake 提交者: Kevin Wolf

commit: Switch commit_populate() to byte-based

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: NEric Blake <eblake@redhat.com>
Reviewed-by: NJohn Snow <jsnow@redhat.com>
Reviewed-by: NJeff Cody <jcody@redhat.com>
Reviewed-by: NKevin Wolf <kwolf@redhat.com>
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
上级 d535435f
...@@ -47,26 +47,25 @@ typedef struct CommitBlockJob { ...@@ -47,26 +47,25 @@ typedef struct CommitBlockJob {
} CommitBlockJob; } CommitBlockJob;
static int coroutine_fn commit_populate(BlockBackend *bs, BlockBackend *base, 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) void *buf)
{ {
int ret = 0; int ret = 0;
QEMUIOVector qiov; QEMUIOVector qiov;
struct iovec iov = { struct iovec iov = {
.iov_base = buf, .iov_base = buf,
.iov_len = nb_sectors * BDRV_SECTOR_SIZE, .iov_len = bytes,
}; };
assert(bytes < SIZE_MAX);
qemu_iovec_init_external(&qiov, &iov, 1); qemu_iovec_init_external(&qiov, &iov, 1);
ret = blk_co_preadv(bs, sector_num * BDRV_SECTOR_SIZE, ret = blk_co_preadv(bs, offset, qiov.size, &qiov, 0);
qiov.size, &qiov, 0);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
ret = blk_co_pwritev(base, sector_num * BDRV_SECTOR_SIZE, ret = blk_co_pwritev(base, offset, qiov.size, &qiov, 0);
qiov.size, &qiov, 0);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
...@@ -193,7 +192,9 @@ static void coroutine_fn commit_run(void *opaque) ...@@ -193,7 +192,9 @@ static void coroutine_fn commit_run(void *opaque)
trace_commit_one_iteration(s, sector_num * BDRV_SECTOR_SIZE, trace_commit_one_iteration(s, sector_num * BDRV_SECTOR_SIZE,
n * BDRV_SECTOR_SIZE, ret); n * BDRV_SECTOR_SIZE, ret);
if (copy) { 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; bytes_written += n * BDRV_SECTOR_SIZE;
} }
if (ret < 0) { if (ret < 0) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册