mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit: Switch commit_populate() to byte-based

Browse Source 
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 <eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Eric Blake 2017-07-07 07:44:44 -05:00 committed by Kevin Wolf
parent d535435f4a
commit d8a9858408
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
block/commit.c
View File

@ -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)
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) {