From nobody Mon Feb 9 12:10:06 2026 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=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1541097006481330.1441433642415; Thu, 1 Nov 2018 11:30:06 -0700 (PDT) Received: from localhost ([::1]:43480 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIHj0-0004Tp-Sk for importer@patchew.org; Thu, 01 Nov 2018 14:29:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIHhA-0002Xe-8y for qemu-devel@nongnu.org; Thu, 01 Nov 2018 14:27:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIHh9-0007jW-1n for qemu-devel@nongnu.org; Thu, 01 Nov 2018 14:27:52 -0400 Received: from relay.sw.ru ([185.231.240.75]:47972) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gIHh8-0007f1-Mp; Thu, 01 Nov 2018 14:27:50 -0400 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1gIHgz-0002Mo-1D; Thu, 01 Nov 2018 21:27:41 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Thu, 1 Nov 2018 21:27:36 +0300 Message-Id: <20181101182738.70462-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181101182738.70462-1-vsementsov@virtuozzo.com> References: <20181101182738.70462-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 5/7] qcow2: use byte-based read in qcow2_decompress_cluster 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: kwolf@redhat.com, den@openvz.org, vsementsov@virtuozzo.com, mreitz@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" We are gradually moving away from sector-based interfaces, towards byte-based. Get rid of it here too. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/qcow2.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index e9d24b801e..950b9f7ec6 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3956,14 +3956,15 @@ fail: int qcow2_decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset) { BDRVQcow2State *s =3D bs->opaque; - int ret, csize, nb_csectors, sector_offset; + int ret, csize, nb_csectors; uint64_t coffset; + struct iovec iov; + QEMUIOVector local_qiov; =20 coffset =3D cluster_offset & s->cluster_offset_mask; if (s->cluster_cache_offset !=3D coffset) { nb_csectors =3D ((cluster_offset >> s->csize_shift) & s->csize_mas= k) + 1; - sector_offset =3D coffset & 511; - csize =3D nb_csectors * 512 - sector_offset; + csize =3D nb_csectors * 512 - (coffset & 511); =20 /* Allocate buffers on first decompress operation, most images are * uncompressed and the memory overhead can be avoided. The buffe= rs @@ -3981,14 +3982,17 @@ int qcow2_decompress_cluster(BlockDriverState *bs, = uint64_t cluster_offset) s->cluster_cache =3D g_malloc(s->cluster_size); } =20 + iov.iov_base =3D s->cluster_data; + iov.iov_len =3D csize; + qemu_iovec_init_external(&local_qiov, &iov, 1); + BLKDBG_EVENT(bs->file, BLKDBG_READ_COMPRESSED); - ret =3D bdrv_read(bs->file, coffset >> 9, s->cluster_data, - nb_csectors); + ret =3D bdrv_co_preadv(bs->file, coffset, csize, &local_qiov, 0); if (ret < 0) { return ret; } if (qcow2_decompress(s->cluster_cache, s->cluster_size, - s->cluster_data + sector_offset, csize) < 0) { + s->cluster_data, csize) < 0) { return -EIO; } s->cluster_cache_offset =3D coffset; --=20 2.18.0