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 <ebl...@redhat.com> > Reviewed-by: John Snow <js...@redhat.com> >
Reviewed-by: Jeff Cody <jc...@redhat.com> > --- > 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 >