[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [PATCH v3 03/20] stream: Switch stream_populate() to by
From: |
Jeff Cody |
Subject: |
Re: [Qemu-block] [PATCH v3 03/20] stream: Switch stream_populate() to byte-based |
Date: |
Fri, 30 Jun 2017 15:57:37 -0400 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
On Tue, Jun 27, 2017 at 02:24:41PM -0500, Eric Blake wrote:
> 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>
> Reviewed-by: John Snow <address@hidden>
>
Reviewed-by: Jeff Cody <address@hidden>
> ---
> v2: no change
> ---
> block/stream.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/block/stream.c b/block/stream.c
> index 6cb3939..746d525 100644
> --- a/block/stream.c
> +++ b/block/stream.c
> @@ -41,20 +41,20 @@ typedef struct StreamBlockJob {
> } StreamBlockJob;
>
> static int coroutine_fn stream_populate(BlockBackend *blk,
> - int64_t sector_num, int nb_sectors,
> + int64_t offset, uint64_t bytes,
> void *buf)
> {
> struct iovec iov = {
> .iov_base = buf,
> - .iov_len = nb_sectors * BDRV_SECTOR_SIZE,
> + .iov_len = bytes,
> };
> QEMUIOVector qiov;
>
> + assert(bytes < SIZE_MAX);
> qemu_iovec_init_external(&qiov, &iov, 1);
>
> /* Copy-on-read the unallocated clusters */
> - return blk_co_preadv(blk, sector_num * BDRV_SECTOR_SIZE, qiov.size,
> &qiov,
> - BDRV_REQ_COPY_ON_READ);
> + return blk_co_preadv(blk, offset, qiov.size, &qiov,
> BDRV_REQ_COPY_ON_READ);
> }
>
> typedef struct {
> @@ -171,7 +171,8 @@ static void coroutine_fn stream_run(void *opaque)
> trace_stream_one_iteration(s, sector_num * BDRV_SECTOR_SIZE,
> n * BDRV_SECTOR_SIZE, ret);
> if (copy) {
> - ret = stream_populate(blk, sector_num, n, buf);
> + ret = stream_populate(blk, sector_num * BDRV_SECTOR_SIZE,
> + n * BDRV_SECTOR_SIZE, buf);
> }
> if (ret < 0) {
> BlockErrorAction action =
> --
> 2.9.4
>
- [Qemu-block] [PATCH v3 00/20] make bdrv_is_allocated[_above] byte-based, Eric Blake, 2017/06/27
- [Qemu-block] [PATCH v3 01/20] blockjob: Track job ratelimits via bytes, not sectors, Eric Blake, 2017/06/27
- [Qemu-block] [PATCH v3 03/20] stream: Switch stream_populate() to byte-based, Eric Blake, 2017/06/27
- Re: [Qemu-block] [PATCH v3 03/20] stream: Switch stream_populate() to byte-based,
Jeff Cody <=
- [Qemu-block] [PATCH v3 02/20] trace: Show blockjob actions via bytes, not sectors, Eric Blake, 2017/06/27
- [Qemu-block] [PATCH v3 04/20] stream: Switch stream_run() to byte-based, Eric Blake, 2017/06/27
- [Qemu-block] [PATCH v3 05/20] commit: Switch commit_populate() to byte-based, Eric Blake, 2017/06/27
- [Qemu-block] [PATCH v3 06/20] commit: Switch commit_run() to byte-based, Eric Blake, 2017/06/27
- [Qemu-block] [PATCH v3 07/20] mirror: Switch MirrorBlockJob to byte-based, Eric Blake, 2017/06/27