From nobody Sun Feb 8 01:21: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.zoho.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 149572642421763.21207741114131; Thu, 25 May 2017 08:33:44 -0700 (PDT) Received: from localhost ([::1]:60538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDuli-0003UK-TG for importer@patchew.org; Thu, 25 May 2017 11:33:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33059) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDufA-0004qE-K5 for qemu-devel@nongnu.org; Thu, 25 May 2017 11:26:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDuf5-0002fr-In for qemu-devel@nongnu.org; Thu, 25 May 2017 11:26:56 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:29617 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dDuf5-0002fF-79 for qemu-devel@nongnu.org; Thu, 25 May 2017 11:26:51 -0400 Received: from kvm.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v4PFQS1q019102; Thu, 25 May 2017 18:26:30 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Thu, 25 May 2017 18:26:24 +0300 Message-Id: <20170525152628.37628-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170525152628.37628-1-vsementsov@virtuozzo.com> References: <20170525152628.37628-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH 3/7] qcow2: add .bdrv_get_format_allocated_size 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, vsementsov@virtuozzo.com, armbru@redhat.com, mreitz@redhat.com, den@openvz.org 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" Realize .bdrv_get_format_allocated_size interface. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/qcow2-refcount.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ block/qcow2.c | 2 ++ block/qcow2.h | 2 ++ 3 files changed, 65 insertions(+) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 7c06061aae..45adf6bd1d 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -2931,3 +2931,64 @@ done: qemu_vfree(new_refblock); return ret; } + +typedef struct NbAllocatedClustersCo { + BlockDriverState *bs; + int64_t ret; +} NbAllocatedClustersCo; + +static void coroutine_fn qcow2_get_format_allocated_size_co_entry(void *op= aque) +{ + NbAllocatedClustersCo *nbco =3D opaque; + BlockDriverState *bs =3D nbco->bs; + BDRVQcow2State *s =3D bs->opaque; + int64_t size, nb_clusters, nb_allocated =3D 0, i; + int ret =3D 0; + + size =3D bdrv_getlength(bs->file->bs); + if (size < 0) { + nbco->ret =3D size; + return; + } + + nb_clusters =3D size_to_clusters(s, size); + + qemu_co_mutex_lock(&s->lock); + + for (i =3D 0; i < nb_clusters; ++i) { + uint64_t refcount; + ret =3D qcow2_get_refcount(bs, i, &refcount); + if (ret < 0) { + nbco->ret =3D ret; + qemu_co_mutex_unlock(&s->lock); + return; + } + if (refcount > 0) { + nb_allocated++; + } + } + + qemu_co_mutex_unlock(&s->lock); + + nbco->ret =3D nb_allocated << s->cluster_bits; +} + +int64_t qcow2_get_format_allocated_size(BlockDriverState *bs) +{ + NbAllocatedClustersCo nbco =3D { + .bs =3D bs, + .ret =3D -EINPROGRESS + }; + + if (qemu_in_coroutine()) { + qcow2_get_format_allocated_size_co_entry(&nbco); + } else { + Coroutine *co =3D + qemu_coroutine_create(qcow2_get_format_allocated_size_co_entry, + &nbco); + qemu_coroutine_enter(co); + BDRV_POLL_WHILE(bs, nbco.ret =3D=3D -EINPROGRESS); + } + + return nbco.ret; +} diff --git a/block/qcow2.c b/block/qcow2.c index a8d61f0981..274f213d16 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3469,6 +3469,8 @@ BlockDriver bdrv_qcow2 =3D { =20 .bdrv_detach_aio_context =3D qcow2_detach_aio_context, .bdrv_attach_aio_context =3D qcow2_attach_aio_context, + + .bdrv_get_format_allocated_size =3D qcow2_get_format_allocated_size, }; =20 static void bdrv_qcow2_init(void) diff --git a/block/qcow2.h b/block/qcow2.h index 1801dc30dc..8cc63d9e0e 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -532,6 +532,8 @@ int qcow2_change_refcount_order(BlockDriverState *bs, i= nt refcount_order, BlockDriverAmendStatusCB *status_cb, void *cb_opaque, Error **errp); =20 +int64_t qcow2_get_format_allocated_size(BlockDriverState *bs); + /* qcow2-cluster.c functions */ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size, bool exact_size); --=20 2.11.1