OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

replication: Switch to byte-based calls 

We are gradually moving away from sector-based interfaces, towards
byte-based.  Make the change for the last few sector-based calls
into the block layer from the replication driver.

Ideally, the replication driver should switch to doing everything
byte-based, but that's a more invasive change that requires a
bit more auditing.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Eric Blake 2018-06-28 15:15:23 -05:00 committed by Kevin Wolf
parent 609841a3f8
commit 04a11d87d1
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
block/replication.c
View File

@ -246,13 +246,14 @@ static coroutine_fn int replication_co_readv(BlockDriverState *bs,
backup_cow_request_begin(&req, child->bs->job, backup_cow_request_begin(&req, child->bs->job,
sector_num * BDRV_SECTOR_SIZE, sector_num * BDRV_SECTOR_SIZE,
remaining_bytes); remaining_bytes);
ret = bdrv_co_readv(bs->file, sector_num, remaining_sectors, ret = bdrv_co_preadv(bs->file, sector_num * BDRV_SECTOR_SIZE,
qiov); remaining_bytes, qiov, 0);
backup_cow_request_end(&req); backup_cow_request_end(&req);
goto out; goto out;
} }
ret = bdrv_co_readv(bs->file, sector_num, remaining_sectors, qiov); ret = bdrv_co_preadv(bs->file, sector_num * BDRV_SECTOR_SIZE,
remaining_sectors * BDRV_SECTOR_SIZE, qiov, 0);
out: out:
return replication_return_value(s, ret); return replication_return_value(s, ret);
} }
@ -279,8 +280,8 @@ static coroutine_fn int replication_co_writev(BlockDriverState *bs,
} }
if (ret == 0) { if (ret == 0) {
ret = bdrv_co_writev(top, sector_num, ret = bdrv_co_pwritev(top, sector_num * BDRV_SECTOR_SIZE,
remaining_sectors, qiov); remaining_sectors * BDRV_SECTOR_SIZE, qiov, 0);
return replication_return_value(s, ret); return replication_return_value(s, ret);
} }
@ -306,7 +307,8 @@ static coroutine_fn int replication_co_writev(BlockDriverState *bs,
qemu_iovec_concat(&hd_qiov, qiov, bytes_done, count); qemu_iovec_concat(&hd_qiov, qiov, bytes_done, count);
target = ret ? top : base; target = ret ? top : base;
ret = bdrv_co_writev(target, sector_num, n, &hd_qiov); ret = bdrv_co_pwritev(target, sector_num * BDRV_SECTOR_SIZE,
n * BDRV_SECTOR_SIZE, &hd_qiov, 0);
if (ret < 0) { if (ret < 0) {
goto out1; goto out1;
} }