[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [PATCH v2 6/8] replication: Switch to byte-based calls
From: |
Jeff Cody |
Subject: |
Re: [Qemu-block] [PATCH v2 6/8] replication: Switch to byte-based calls |
Date: |
Thu, 31 May 2018 23:55:07 -0400 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
On Thu, May 31, 2018 at 03:50:44PM -0500, Eric Blake wrote:
> 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 <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
> ---
> block/replication.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/block/replication.c b/block/replication.c
> index 826db7b3049..6349d6958e4 100644
> --- a/block/replication.c
> +++ b/block/replication.c
> @@ -246,13 +246,14 @@ static coroutine_fn int
> replication_co_readv(BlockDriverState *bs,
> backup_cow_request_begin(&req, child->bs->job,
> sector_num * BDRV_SECTOR_SIZE,
> remaining_bytes);
> - ret = bdrv_co_readv(bs->file, sector_num, remaining_sectors,
> - qiov);
> + ret = bdrv_co_preadv(bs->file, sector_num * BDRV_SECTOR_SIZE,
> + remaining_bytes, qiov, 0);
> backup_cow_request_end(&req);
> 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:
> return replication_return_value(s, ret);
> }
> @@ -279,8 +280,8 @@ static coroutine_fn int
> replication_co_writev(BlockDriverState *bs,
> }
>
> if (ret == 0) {
> - ret = bdrv_co_writev(top, sector_num,
> - remaining_sectors, qiov);
> + ret = bdrv_co_pwritev(top, sector_num * BDRV_SECTOR_SIZE,
> + remaining_sectors * BDRV_SECTOR_SIZE, qiov, 0);
> 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);
>
> 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) {
> goto out1;
> }
> --
> 2.14.3
>
>
- [Qemu-block] [PATCH v2 0/8] block: more byte-based cleanups: vectored I/O, Eric Blake, 2018/05/31
- [Qemu-block] [PATCH v2 2/8] qcow: Switch get_cluster_offset to be byte-based, Eric Blake, 2018/05/31
- [Qemu-block] [PATCH v2 1/8] parallels: Switch to byte-based calls, Eric Blake, 2018/05/31
- [Qemu-block] [PATCH v2 3/8] qcow: Switch qcow_co_readv to byte-based calls, Eric Blake, 2018/05/31
- [Qemu-block] [PATCH v2 5/8] qcow: Switch to a byte-based driver, Eric Blake, 2018/05/31
- [Qemu-block] [PATCH v2 7/8] vhdx: Switch to byte-based calls, Eric Blake, 2018/05/31
- [Qemu-block] [PATCH v2 4/8] qcow: Switch qcow_co_writev to byte-based calls, Eric Blake, 2018/05/31
- [Qemu-block] [PATCH v2 6/8] replication: Switch to byte-based calls, Eric Blake, 2018/05/31
- Re: [Qemu-block] [PATCH v2 6/8] replication: Switch to byte-based calls,
Jeff Cody <=
- [Qemu-block] [PATCH v2 8/8] block: Remove unused sector-based vectored I/O, Eric Blake, 2018/05/31