From nobody Mon Feb 9 12:26:23 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505400347116443.3230055561246; Thu, 14 Sep 2017 07:45:47 -0700 (PDT) Received: from localhost ([::1]:48199 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsVOk-0001k9-Ck for importer@patchew.org; Thu, 14 Sep 2017 10:45:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsVKR-0005xz-Vn for qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dsVKR-0002hq-03 for qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54304) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dsVKJ-0002ba-Ol; Thu, 14 Sep 2017 10:41:12 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 654135F7B7; Thu, 14 Sep 2017 14:41:10 +0000 (UTC) Received: from red.redhat.com (ovpn-123-70.rdu2.redhat.com [10.10.123.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07CEA60841; Thu, 14 Sep 2017 14:41:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 654135F7B7 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=eblake@redhat.com From: Eric Blake To: qemu-devel@nongnu.org Date: Thu, 14 Sep 2017 09:40:22 -0500 Message-Id: <20170914144032.14945-11-eblake@redhat.com> In-Reply-To: <20170914144032.14945-1-eblake@redhat.com> References: <20170914144032.14945-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 14 Sep 2017 14:41:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 10/20] qcow: Switch to .bdrv_co_block_status() 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, famz@redhat.com, jsnow@redhat.com, qemu-block@nongnu.org, 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. Update the qcow driver accordingly. There is no intent to optimize based on the mapping flag for this format. Signed-off-by: Eric Blake --- v3: rebase to master v2: rebase to mapping flag --- block/qcow.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/block/qcow.c b/block/qcow.c index f450b00cfc..ee521d590c 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -511,23 +511,28 @@ static int get_cluster_offset(BlockDriverState *bs, return 1; } -static int64_t coroutine_fn qcow_co_get_block_status(BlockDriverState *bs, - int64_t sector_num, int nb_sectors, int *pnum, BlockDriverState **= file) +static int64_t coroutine_fn qcow_co_block_status(BlockDriverState *bs, + bool mapping, + int64_t offset, int64_t b= ytes, + int64_t *pnum, + BlockDriverState **file) { BDRVQcowState *s =3D bs->opaque; - int index_in_cluster, n, ret; + int index_in_cluster, ret; + int64_t n; uint64_t cluster_offset; qemu_co_mutex_lock(&s->lock); - ret =3D get_cluster_offset(bs, sector_num << 9, 0, 0, 0, 0, &cluster_o= ffset); + ret =3D get_cluster_offset(bs, offset, 0, 0, 0, 0, &cluster_offset); qemu_co_mutex_unlock(&s->lock); if (ret < 0) { return ret; } - index_in_cluster =3D sector_num & (s->cluster_sectors - 1); - n =3D s->cluster_sectors - index_in_cluster; - if (n > nb_sectors) - n =3D nb_sectors; + index_in_cluster =3D offset & (s->cluster_size - 1); + n =3D s->cluster_size - index_in_cluster; + if (n > bytes) { + n =3D bytes; + } *pnum =3D n; if (!cluster_offset) { return 0; @@ -535,7 +540,7 @@ static int64_t coroutine_fn qcow_co_get_block_status(Bl= ockDriverState *bs, if ((cluster_offset & QCOW_OFLAG_COMPRESSED) || s->crypto) { return BDRV_BLOCK_DATA; } - cluster_offset |=3D (index_in_cluster << BDRV_SECTOR_BITS); + cluster_offset |=3D (index_in_cluster & BDRV_BLOCK_OFFSET_MASK); *file =3D bs->file->bs; return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | cluster_offset; } @@ -1108,7 +1113,7 @@ static BlockDriver bdrv_qcow =3D { .bdrv_co_readv =3D qcow_co_readv, .bdrv_co_writev =3D qcow_co_writev, - .bdrv_co_get_block_status =3D qcow_co_get_block_status, + .bdrv_co_block_status =3D qcow_co_block_status, .bdrv_make_empty =3D qcow_make_empty, .bdrv_co_pwritev_compressed =3D qcow_co_pwritev_compressed, --=20 2.13.5