From nobody Mon Feb 9 12:26:22 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 1505401309395820.5862651431391; Thu, 14 Sep 2017 08:01:49 -0700 (PDT) Received: from localhost ([::1]:48295 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsVeG-0003at-38 for importer@patchew.org; Thu, 14 Sep 2017 11:01:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsVKb-00065G-7q for qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dsVKW-0002mg-KF for qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48600) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dsVKQ-0002gv-MD; Thu, 14 Sep 2017 10:41:18 -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 BE038285C1; Thu, 14 Sep 2017 14:41:17 +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 A3D1060841; Thu, 14 Sep 2017 14:41:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BE038285C1 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.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:23 -0500 Message-Id: <20170914144032.14945-12-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.30]); Thu, 14 Sep 2017 14:41:17 +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 11/20] qcow2: 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 qcow2 driver accordingly. For now, we are ignoring the 'mapping' hint. However, it should be relatively straightforward to honor the hint as a way to return larger *pnum values when we have consecutive clusters with the same data/zero status but which differ only in having non-consecutive mappings. Signed-off-by: Eric Blake --- v2: rebase to mapping flag --- block/qcow2.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 721cb077fe..de5f737681 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1624,8 +1624,12 @@ static void qcow2_join_options(QDict *options, QDict= *old_options) } } -static int64_t coroutine_fn qcow2_co_get_block_status(BlockDriverState *bs, - int64_t sector_num, int nb_sectors, int *pnum, BlockDriverState **= file) +static int64_t coroutine_fn qcow2_co_block_status(BlockDriverState *bs, + bool mapping, + int64_t offset, + int64_t count, + int64_t *pnum, + BlockDriverState **file) { BDRVQcow2State *s =3D bs->opaque; uint64_t cluster_offset; @@ -1633,21 +1637,20 @@ static int64_t coroutine_fn qcow2_co_get_block_stat= us(BlockDriverState *bs, unsigned int bytes; int64_t status =3D 0; - bytes =3D MIN(INT_MAX, nb_sectors * BDRV_SECTOR_SIZE); + bytes =3D MIN(INT_MAX, count); qemu_co_mutex_lock(&s->lock); - ret =3D qcow2_get_cluster_offset(bs, sector_num << 9, &bytes, - &cluster_offset); + ret =3D qcow2_get_cluster_offset(bs, offset, &bytes, &cluster_offset); qemu_co_mutex_unlock(&s->lock); if (ret < 0) { return ret; } - *pnum =3D bytes >> BDRV_SECTOR_BITS; + *pnum =3D bytes; if (cluster_offset !=3D 0 && ret !=3D QCOW2_CLUSTER_COMPRESSED && !s->crypto) { - index_in_cluster =3D sector_num & (s->cluster_sectors - 1); - cluster_offset |=3D (index_in_cluster << BDRV_SECTOR_BITS); + index_in_cluster =3D offset & (s->cluster_size - 1); + cluster_offset |=3D (index_in_cluster & BDRV_BLOCK_OFFSET_MASK); *file =3D bs->file->bs; status |=3D BDRV_BLOCK_OFFSET_VALID | cluster_offset; } @@ -4259,7 +4262,7 @@ BlockDriver bdrv_qcow2 =3D { .bdrv_child_perm =3D bdrv_format_default_perms, .bdrv_create =3D qcow2_create, .bdrv_has_zero_init =3D bdrv_has_zero_init_1, - .bdrv_co_get_block_status =3D qcow2_co_get_block_status, + .bdrv_co_block_status =3D qcow2_co_block_status, .bdrv_co_preadv =3D qcow2_co_preadv, .bdrv_co_pwritev =3D qcow2_co_pwritev, --=20 2.13.5