From nobody Sun Oct 5 19:25:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1524681606144870.2742791699725; Wed, 25 Apr 2018 11:40:06 -0700 (PDT) Received: from localhost ([::1]:38494 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBPKj-0003Ld-Fy for importer@patchew.org; Wed, 25 Apr 2018 14:40:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBPDa-0005xU-QL for qemu-devel@nongnu.org; Wed, 25 Apr 2018 14:32:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBPDZ-0004QX-Fv for qemu-devel@nongnu.org; Wed, 25 Apr 2018 14:32:38 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34004 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fBPDV-0004Ip-0U; Wed, 25 Apr 2018 14:32:33 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 98EFC81A8071; Wed, 25 Apr 2018 18:32:32 +0000 (UTC) Received: from red.redhat.com (ovpn-123-175.rdu2.redhat.com [10.10.123.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52043111CB8E; Wed, 25 Apr 2018 18:32:29 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Wed, 25 Apr 2018 13:32:16 -0500 Message-Id: <20180425183223.580566-2-eblake@redhat.com> In-Reply-To: <20180425183223.580566-1-eblake@redhat.com> References: <20180425183223.580566-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 25 Apr 2018 18:32:32 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 25 Apr 2018 18:32:32 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'eblake@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 1/8] parallels: Switch to byte-based calls X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Denis V. Lunev" , "open list:parallels" , Stefan Hajnoczi , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 parallels driver. Ideally, the parallels 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: Denis V. Lunev Reviewed-by: Stefan Hajnoczi --- block/parallels.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/block/parallels.c b/block/parallels.c index 3f74fcb877a..c071c7f759f 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -226,14 +226,15 @@ static int64_t allocate_clusters(BlockDriverState *bs= , int64_t sector_num, }; qemu_iovec_init_external(&qiov, &iov, 1); - ret =3D bdrv_co_readv(bs->backing, idx * s->tracks, nb_cow_sectors, - &qiov); + ret =3D bdrv_co_preadv(bs->backing, idx * s->tracks * BDRV_SECTOR_= SIZE, + nb_cow_bytes, &qiov, 0); if (ret < 0) { qemu_vfree(iov.iov_base); return ret; } - ret =3D bdrv_co_writev(bs->file, s->data_end, nb_cow_sectors, &qio= v); + ret =3D bdrv_co_pwritev(bs->file, s->data_end * BDRV_SECTOR_SIZE, + nb_cow_bytes, &qiov, 0); qemu_vfree(iov.iov_base); if (ret < 0) { return ret; @@ -339,7 +340,8 @@ static coroutine_fn int parallels_co_writev(BlockDriver= State *bs, qemu_iovec_reset(&hd_qiov); qemu_iovec_concat(&hd_qiov, qiov, bytes_done, nbytes); - ret =3D bdrv_co_writev(bs->file, position, n, &hd_qiov); + ret =3D bdrv_co_pwritev(bs->file, position * BDRV_SECTOR_SIZE, nby= tes, + &hd_qiov, 0); if (ret < 0) { break; } @@ -378,7 +380,8 @@ static coroutine_fn int parallels_co_readv(BlockDriverS= tate *bs, if (position < 0) { if (bs->backing) { - ret =3D bdrv_co_readv(bs->backing, sector_num, n, &hd_qiov= ); + ret =3D bdrv_co_preadv(bs->backing, sector_num * BDRV_SECT= OR_SIZE, + nbytes, &hd_qiov, 0); if (ret < 0) { break; } @@ -386,7 +389,8 @@ static coroutine_fn int parallels_co_readv(BlockDriverS= tate *bs, qemu_iovec_memset(&hd_qiov, 0, 0, nbytes); } } else { - ret =3D bdrv_co_readv(bs->file, position, n, &hd_qiov); + ret =3D bdrv_co_preadv(bs->file, position * BDRV_SECTOR_SIZE, = nbytes, + &hd_qiov, 0); if (ret < 0) { break; } --=20 2.14.3