From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOb9p-0002T4-Pz for qemu-devel@nongnu.org; Thu, 31 May 2018 23:55:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOb9o-00013V-Ty for qemu-devel@nongnu.org; Thu, 31 May 2018 23:55:17 -0400 Date: Thu, 31 May 2018 23:55:07 -0400 From: Jeff Cody Message-ID: <20180601035507.GF11303@localhost.localdomain> References: <20180531205046.153256-1-eblake@redhat.com> <20180531205046.153256-7-eblake@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180531205046.153256-7-eblake@redhat.com> Subject: Re: [Qemu-devel] [Qemu-block] [PATCH v2 6/8] replication: Switch to byte-based calls List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: qemu-devel@nongnu.org, kwolf@redhat.com, Wen Congyang , Xie Changlong , qemu-block@nongnu.org, mreitz@redhat.com 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 Reviewed-by: Jeff Cody > --- > 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 > >