From nobody Mon Feb 9 01:30:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1559665320; cv=none; d=zoho.com; s=zohoarc; b=FIx1akK08vNLiq4ZYdVbmbKYzyNiUo1eQSN9e8QHvpDV181fUMLZxnTvTuxy6dQxEdrDqUp3DYg24Q5LqREfWWGsHGZQW7ey4ADLmrdErSCGFnwCiBg9fnMqQXDzT09gh+gxsONP9znsVpR2NcR0tC74pjVhKe2nj/wym5l8eoU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559665320; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=cu5XCHNf1ujlH6oUK4YSVfStc6I/QqY1DJBxYWmMn9k=; b=obpaJpzVnPn46qXVog2IuEnFiCNMZpNcDTi56suS9IYhqRcCcNy1h6mrod4slm1SpxJWkWPsB68/RHmszcMrQFmVkxhUQGircwTMHsWyfKY4WbVwcx7vRxH1pgeX+M8WTbogbrIOa/q577jXrV9e8cSVWM3T9dWgdz5jjLS7SYc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559665320252735.3142484131288; Tue, 4 Jun 2019 09:22:00 -0700 (PDT) Received: from localhost ([127.0.0.1]:54907 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYCC3-0004xQ-VF for importer@patchew.org; Tue, 04 Jun 2019 12:21:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35821) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYC6D-000148-KF for qemu-devel@nongnu.org; Tue, 04 Jun 2019 12:15:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYC6A-0005fs-Qc for qemu-devel@nongnu.org; Tue, 04 Jun 2019 12:15:44 -0400 Received: from relay.sw.ru ([185.231.240.75]:41680) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYC6A-0005Bz-Iv; Tue, 04 Jun 2019 12:15:42 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1hYC5k-0005Pq-2h; Tue, 04 Jun 2019 19:15:16 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 4 Jun 2019 19:15:09 +0300 Message-Id: <20190604161514.262241-8-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190604161514.262241-1-vsementsov@virtuozzo.com> References: <20190604161514.262241-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v2 07/12] block/io: bdrv_aligned_preadv: use and support qiov_offset 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: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use and support new API in bdrv_co_do_copy_on_readv. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/io.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/block/io.c b/block/io.c index a4f67aca47..0cc80e2d5a 100644 --- a/block/io.c +++ b/block/io.c @@ -1309,7 +1309,7 @@ err: */ static int coroutine_fn bdrv_aligned_preadv(BdrvChild *child, BdrvTrackedRequest *req, int64_t offset, unsigned int bytes, - int64_t align, QEMUIOVector *qiov, int flags) + int64_t align, QEMUIOVector *qiov, size_t qiov_offset, int flags) { BlockDriverState *bs =3D child->bs; int64_t total_bytes, max_bytes; @@ -1320,7 +1320,6 @@ static int coroutine_fn bdrv_aligned_preadv(BdrvChild= *child, assert(is_power_of_2(align)); assert((offset & (align - 1)) =3D=3D 0); assert((bytes & (align - 1)) =3D=3D 0); - assert(!qiov || bytes =3D=3D qiov->size); assert((bs->open_flags & BDRV_O_NO_IO) =3D=3D 0); max_transfer =3D QEMU_ALIGN_DOWN(MIN_NON_ZERO(bs->bl.max_transfer, INT= _MAX), align); @@ -1357,7 +1356,8 @@ static int coroutine_fn bdrv_aligned_preadv(BdrvChild= *child, } =20 if (!ret || pnum !=3D bytes) { - ret =3D bdrv_co_do_copy_on_readv(child, offset, bytes, qiov, 0= ); + ret =3D bdrv_co_do_copy_on_readv(child, offset, bytes, + qiov, qiov_offset); goto out; } } @@ -1371,7 +1371,7 @@ static int coroutine_fn bdrv_aligned_preadv(BdrvChild= *child, =20 max_bytes =3D ROUND_UP(MAX(0, total_bytes - offset), align); if (bytes <=3D max_bytes && bytes <=3D max_transfer) { - ret =3D bdrv_driver_preadv(bs, offset, bytes, qiov, 0, 0); + ret =3D bdrv_driver_preadv(bs, offset, bytes, qiov, qiov_offset, 0= ); goto out; } =20 @@ -1379,17 +1379,12 @@ static int coroutine_fn bdrv_aligned_preadv(BdrvChi= ld *child, int num; =20 if (max_bytes) { - QEMUIOVector local_qiov; - num =3D MIN(bytes_remaining, MIN(max_bytes, max_transfer)); assert(num); - qemu_iovec_init(&local_qiov, qiov->niov); - qemu_iovec_concat(&local_qiov, qiov, bytes - bytes_remaining, = num); =20 ret =3D bdrv_driver_preadv(bs, offset + bytes - bytes_remainin= g, - num, &local_qiov, 0, 0); + num, qiov, bytes - bytes_remaining, 0= ); max_bytes -=3D num; - qemu_iovec_destroy(&local_qiov); } else { num =3D bytes_remaining; ret =3D qemu_iovec_memset(qiov, bytes - bytes_remaining, 0, @@ -1486,7 +1481,7 @@ static int bdrv_padding_rmw_read(BdrvChild *child, =20 bdrv_debug_event(bs, BLKDBG_PWRITEV_RMW_HEAD); ret =3D bdrv_aligned_preadv(child, req, req->overlap_offset, bytes, - align, &local_qiov, 0); + align, &local_qiov, 0, 0); if (ret < 0) { return ret; } @@ -1504,7 +1499,7 @@ static int bdrv_padding_rmw_read(BdrvChild *child, ret =3D bdrv_aligned_preadv( child, req, req->overlap_offset + req->overlap_bytes - align, - align, align, &local_qiov, 0); + align, align, &local_qiov, 0, 0); if (ret < 0) { return ret; } @@ -1585,7 +1580,7 @@ int coroutine_fn bdrv_co_preadv(BdrvChild *child, tracked_request_begin(&req, bs, offset, bytes, BDRV_TRACKED_READ); ret =3D bdrv_aligned_preadv(child, &req, offset, bytes, bs->bl.request_alignment, - qiov, flags); + qiov, 0, flags); tracked_request_end(&req); bdrv_dec_in_flight(bs); =20 --=20 2.18.0