From nobody Mon Apr 29 14:54:55 2024 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 1501346689159826.0838601089272; Sat, 29 Jul 2017 09:44:49 -0700 (PDT) Received: from localhost ([::1]:52924 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dbUr9-0008Uj-Jg for importer@patchew.org; Sat, 29 Jul 2017 12:44:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dbUo7-00060Q-1R for qemu-devel@nongnu.org; Sat, 29 Jul 2017 12:41:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dbUo5-00019E-1m for qemu-devel@nongnu.org; Sat, 29 Jul 2017 12:41:39 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:49014 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 1dbUo4-00017q-HA for qemu-devel@nongnu.org; Sat, 29 Jul 2017 12:41:36 -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 v6TGf4Nm031171; Sat, 29 Jul 2017 19:41:05 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Sat, 29 Jul 2017 19:41:02 +0300 Message-Id: <20170729164104.29537-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170729164104.29537-1-vsementsov@virtuozzo.com> References: <20170729164104.29537-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 v4 1/3] block: add bdrv_get_format_alloc_stat format interface 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" The function should collect statistics, about used/unused by top-level format driver space (in its .file) and allocation status (data/zero/discarded/after-eof) of corresponding areas in this .file. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block.c | 16 +++++++++++ include/block/block.h | 3 ++ include/block/block_int.h | 2 ++ qapi/block-core.json | 72 +++++++++++++++++++++++++++++++++++++++++++= ++++ 4 files changed, 93 insertions(+) diff --git a/block.c b/block.c index 50ba264143..7d720ae0c2 100644 --- a/block.c +++ b/block.c @@ -3407,6 +3407,22 @@ int64_t bdrv_get_allocated_file_size(BlockDriverStat= e *bs) } =20 /** + * Collect format allocation info. See BlockFormatAllocInfo definition in + * qapi/block-core.json. + */ +int bdrv_get_format_alloc_stat(BlockDriverState *bs, BlockFormatAllocInfo = *bfai) +{ + BlockDriver *drv =3D bs->drv; + if (!drv) { + return -ENOMEDIUM; + } + if (drv->bdrv_get_format_alloc_stat) { + return drv->bdrv_get_format_alloc_stat(bs, bfai); + } + return -ENOTSUP; +} + +/** * Return number of sectors on success, -errno on error. */ int64_t bdrv_nb_sectors(BlockDriverState *bs) diff --git a/include/block/block.h b/include/block/block.h index 9b355e92d8..646376a772 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -335,6 +335,9 @@ typedef enum { =20 int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res, BdrvCheckMode f= ix); =20 +int bdrv_get_format_alloc_stat(BlockDriverState *bs, + BlockFormatAllocInfo *bfai); + /* The units of offset and total_work_size may be chosen arbitrarily by the * block driver; total_work_size may change during the course of the amend= ment * operation */ diff --git a/include/block/block_int.h b/include/block/block_int.h index 8d3724cce6..458c715e99 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -208,6 +208,8 @@ struct BlockDriver { int64_t (*bdrv_getlength)(BlockDriverState *bs); bool has_variable_length; int64_t (*bdrv_get_allocated_file_size)(BlockDriverState *bs); + int (*bdrv_get_format_alloc_stat)(BlockDriverState *bs, + BlockFormatAllocInfo *bfai); =20 int coroutine_fn (*bdrv_co_pwritev_compressed)(BlockDriverState *bs, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov); diff --git a/qapi/block-core.json b/qapi/block-core.json index ea0b3e8b13..93f6995381 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -139,6 +139,78 @@ '*format-specific': 'ImageInfoSpecific' } } =20 ## +# @BlockFormatAllocInfo: +# +# +# Allocation information of an underlying protocol file, as partitioned by= a +# format driver's utilization of said allocations. +# All fields are in bytes. +# +# Regions of the underlying protocol file may be considered used or unused= by +# the format driver interpreting these regions. It is at the discretion of= the +# format driver (e.g. qcow2) which regions of its backing storage are cons= idered +# in-use or not. +# +# For now, the only format driver supporting this feature is Qcow2 which i= s a +# cluster based format. Clusters considered in-use by qcow2 are those with= a +# non-zero refcount in the format metadata. All other clusters, if present= , are +# considered unused. Examples of unused allocations for the Qcow2 format a= re +# leaked clusters, pre-allocated clusters, and recently freed clusters. +# +# Note: the whole underlying protocol file is described as well as all for= mat +# file allocations, not only virtual disk data (metadata, internal snapsho= ts, +# etc. are included). +# +# For the underlying protocol file there are native block-status types of = the +# regions: +# - data: allocated data +# - zero: reported as zero (for example, this type corresponds to holes f= or +# POSIX files on sparce file-system) +# - discarded: not allocated +# 4th additional type is 'overrun', is data referenced by the format driver +# located beyond EOF of the underlying protocol file. For example, a parti= ally +# allocated cluster at the end of a QCOW2 file, where Qcow2 generally oper= ates +# on complete clusters. +# +# So, the fields are: +# +# @used-data: used by the format file and backed by data in the underlying +# protocol file +# +# @used-zero: used by the format file and backed by zeroes in the underlyi= ng +# protocol file; which may be a filesystem hole for POSIX file= s. +# +# @used-discarded: used by the format file but actually unallocated in the +# underlying protocol file +# +# @used-overrun: used by the format file beyond the end of the underlying +# protocol file +# +# @unused-data: allocated data in the underlying protocol file not used by= the +# format file +# +# @unused-zero: reported-as-zero regions in the underlying protocol file n= ot +# used by the format file +# +# @unused-discarded: unallocated areas in the underlying protocol file not= used +# by the format file +# +# Note: sum of 6 fields {used,unused}-{data,zero,discarded} is equal to the +# length of the underlying protocol file. +# +# Since: 2.11 +# +## +{ 'struct': 'BlockFormatAllocInfo', + 'data': {'used-data': 'uint64', + 'used-zero': 'uint64', + 'used-discarded': 'uint64', + 'used-overrun': 'uint64', + 'unused-data': 'uint64', + 'unused-zero': 'uint64', + 'unused-discarded': 'uint64' } } + +## # @ImageCheck: # # Information about a QEMU image file check --=20 2.11.1 From nobody Mon Apr 29 14:54:55 2024 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 1501346579596296.72833560092374; Sat, 29 Jul 2017 09:42:59 -0700 (PDT) Received: from localhost ([::1]:52918 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dbUpM-0006hf-Ut for importer@patchew.org; Sat, 29 Jul 2017 12:42:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37663) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dbUnx-0005xb-QZ for qemu-devel@nongnu.org; Sat, 29 Jul 2017 12:41:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dbUnu-00012J-MC for qemu-devel@nongnu.org; Sat, 29 Jul 2017 12:41:29 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:47693 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 1dbUnu-00011O-6H for qemu-devel@nongnu.org; Sat, 29 Jul 2017 12:41:26 -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 v6TGf4Nn031171; Sat, 29 Jul 2017 19:41:05 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Sat, 29 Jul 2017 19:41:03 +0300 Message-Id: <20170729164104.29537-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170729164104.29537-1-vsementsov@virtuozzo.com> References: <20170729164104.29537-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 v4 2/3] qcow2: add .bdrv_get_format_alloc_stat 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_alloc_stat interface. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/qcow2-refcount.c | 152 +++++++++++++++++++++++++++++++++++++++++++++= ++++ block/qcow2.c | 2 + block/qcow2.h | 2 + 3 files changed, 156 insertions(+) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 7c06061aae..fd6027f0c2 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -2931,3 +2931,155 @@ done: qemu_vfree(new_refblock); return ret; } + +typedef struct FormatAllocStatCo { + BlockDriverState *bs; + BlockFormatAllocInfo *bfai; + int64_t ret; +} FormatAllocStatCo; + +static void coroutine_fn qcow2_get_format_alloc_stat_entry(void *opaque) +{ + int ret =3D 0; + FormatAllocStatCo *nbco =3D opaque; + BlockDriverState *bs =3D nbco->bs; + BDRVQcow2State *s =3D bs->opaque; + BlockFormatAllocInfo *bfai =3D nbco->bfai; + int64_t cluster, file_sectors, sector; + int refcount_block_offset; + uint32_t i; + bool used =3D false, f_data =3D false, f_zero =3D false; + int dif, num =3D 0, f_num =3D 0; + + memset(bfai, 0, sizeof(*bfai)); + + file_sectors =3D bdrv_nb_sectors(bs->file->bs); + if (file_sectors < 0) { + nbco->ret =3D file_sectors; + return; + } + + qemu_co_mutex_lock(&s->lock); + + for (sector =3D 0; sector < file_sectors; sector +=3D dif) { + if (f_num =3D=3D 0) { + BlockDriverState *file; + ret =3D bdrv_get_block_status(bs->file->bs, sector, + file_sectors - sector, &f_num, &fi= le); + if (ret < 0) { + goto fail; + } + f_data =3D ret & BDRV_BLOCK_DATA; + f_zero =3D ret & BDRV_BLOCK_ZERO; + } + + if (num =3D=3D 0) { + uint64_t refcount; + assert(((sector << BDRV_SECTOR_BITS) & (s->cluster_size - 1)) = =3D=3D 0); + ret =3D qcow2_get_refcount( + bs, (sector << BDRV_SECTOR_BITS) >> s->cluster_bits, &refc= ount); + if (ret < 0) { + goto fail; + } + used =3D refcount > 0; + num =3D s->cluster_size >> BDRV_SECTOR_BITS; + } + + dif =3D MIN(f_num, MIN(num, file_sectors - sector)); + if (used) { + if (f_data) { + bfai->used_data +=3D dif; + } else if (f_zero) { + bfai->used_zero +=3D dif; + } else { + bfai->used_discarded +=3D dif; + } + } else { + if (f_data) { + bfai->unused_data +=3D dif; + } else if (f_zero) { + bfai->unused_zero +=3D dif; + } else { + bfai->unused_discarded +=3D dif; + } + } + f_num -=3D dif; + num -=3D dif; + } + + assert(f_num =3D=3D 0); + + if (used) { + bfai->used_overrun +=3D num; + } + + cluster =3D size_to_clusters(s, sector << BDRV_SECTOR_BITS); + refcount_block_offset =3D cluster & (s->refcount_block_size - 1); + for (i =3D cluster >> s->refcount_block_bits; + i <=3D s->max_refcount_table_index; i++) + { + int j; + + if (!(s->refcount_table[i] & REFT_OFFSET_MASK)) { + refcount_block_offset =3D 0; + continue; + } + + for (j =3D refcount_block_offset; j < s->refcount_block_size; j++)= { + uint64_t refcount; + cluster =3D (i << s->refcount_block_bits) + j; + + ret =3D qcow2_get_refcount(bs, cluster, &refcount); + if (ret < 0) { + goto fail; + } + if (refcount > 0) { + bfai->used_overrun++; + } + } + + refcount_block_offset =3D 0; + } + + qemu_co_mutex_unlock(&s->lock); + + bfai->used_data =3D bfai->used_data << BDRV_SECTOR_BITS; + bfai->used_zero =3D bfai->used_zero << BDRV_SECTOR_BITS; + bfai->used_discarded =3D bfai->used_discarded << BDRV_SECTOR_BITS; + bfai->used_overrun =3D bfai->used_overrun << BDRV_SECTOR_BITS; + + bfai->unused_data =3D bfai->unused_data << BDRV_SECTOR_BITS; + bfai->unused_zero =3D bfai->unused_zero << BDRV_SECTOR_BITS; + bfai->unused_discarded =3D bfai->unused_discarded << BDRV_SECTOR_BITS; + + nbco->ret =3D 0; + return; + +fail: + nbco->ret =3D ret; + qemu_co_mutex_unlock(&s->lock); +} + +/* qcow2_get_format_alloc_stat() + * Fills @bfai struct. In case of failure @bfai content is unpredicted. + */ +int qcow2_get_format_alloc_stat(BlockDriverState *bs, + BlockFormatAllocInfo *bfai) +{ + FormatAllocStatCo nbco =3D { + .bs =3D bs, + .bfai =3D bfai, + .ret =3D -EINPROGRESS + }; + + if (qemu_in_coroutine()) { + qcow2_get_format_alloc_stat_entry(&nbco); + } else { + Coroutine *co =3D + qemu_coroutine_create(qcow2_get_format_alloc_stat_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..0e26b548fd 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_alloc_stat =3D qcow2_get_format_alloc_stat, }; =20 static void bdrv_qcow2_init(void) diff --git a/block/qcow2.h b/block/qcow2.h index 1801dc30dc..16d31a8624 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -598,4 +598,6 @@ int qcow2_cache_get_empty(BlockDriverState *bs, Qcow2Ca= che *c, uint64_t offset, void **table); void qcow2_cache_put(BlockDriverState *bs, Qcow2Cache *c, void **table); =20 +int qcow2_get_format_alloc_stat(BlockDriverState *bs, + BlockFormatAllocInfo *bfai); #endif --=20 2.11.1 From nobody Mon Apr 29 14:54:55 2024 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 1501346590678235.88750407922055; Sat, 29 Jul 2017 09:43:10 -0700 (PDT) Received: from localhost ([::1]:52920 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dbUpZ-0006ql-7A for importer@patchew.org; Sat, 29 Jul 2017 12:43:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dbUo7-00060O-10 for qemu-devel@nongnu.org; Sat, 29 Jul 2017 12:41:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dbUo3-00018D-Tp for qemu-devel@nongnu.org; Sat, 29 Jul 2017 12:41:39 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:35283 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 1dbUo3-00017B-Id for qemu-devel@nongnu.org; Sat, 29 Jul 2017 12:41:35 -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 v6TGf4No031171; Sat, 29 Jul 2017 19:41:05 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Sat, 29 Jul 2017 19:41:04 +0300 Message-Id: <20170729164104.29537-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170729164104.29537-1-vsementsov@virtuozzo.com> References: <20170729164104.29537-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 v4 3/3] qemu-img check: add format allocation info 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" Signed-off-by: Vladimir Sementsov-Ogievskiy --- qapi/block-core.json | 6 +++++- qemu-img.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 93f6995381..d662786261 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -249,6 +249,9 @@ # field is present if the driver for the image format # supports it # +# @format-alloc-info: Format-allocation information, see +# BlockFormatAllocInfo description. (Since: 2.11) +# # Since: 1.4 # ## @@ -257,7 +260,8 @@ '*image-end-offset': 'int', '*corruptions': 'int', '*leaks': 'i= nt', '*corruptions-fixed': 'int', '*leaks-fixed': 'int', '*total-clusters': 'int', '*allocated-clusters': 'int', - '*fragmented-clusters': 'int', '*compressed-clusters': 'int' } } + '*fragmented-clusters': 'int', '*compressed-clusters': 'int', + '*format-alloc-info': 'BlockFormatAllocInfo' } } =20 ## # @MapEntry: diff --git a/qemu-img.c b/qemu-img.c index b506839ef0..b3adf9a1a2 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -560,6 +560,35 @@ static void dump_json_image_check(ImageCheck *check, b= ool quiet) QDECREF(str); } =20 +static void dump_human_format_alloc_info(BlockFormatAllocInfo *bfai, bool = quiet) +{ + char *used_data =3D size_to_str(bfai->used_data); + char *used_zero =3D size_to_str(bfai->used_zero); + char *used_discarded =3D size_to_str(bfai->used_discarded); + char *used_overrun =3D size_to_str(bfai->used_overrun); + + char *unused_data =3D size_to_str(bfai->unused_data); + char *unused_zero =3D size_to_str(bfai->unused_zero); + char *unused_discarded =3D size_to_str(bfai->unused_discarded); + + qprintf(quiet, + "Format allocation info (including metadata):\n" + " data zero discarded after-eof\n" + "used %10s %10s %10s %10s\n" + "unused %10s %10s %10s\n", + used_data, used_zero, used_discarded, used_overrun, + unused_data, unused_zero, unused_discarded); + + g_free(used_data); + g_free(used_zero); + g_free(used_discarded); + g_free(used_overrun); + + g_free(unused_data); + g_free(unused_zero); + g_free(unused_discarded); +} + static void dump_human_image_check(ImageCheck *check, bool quiet) { if (!(check->corruptions || check->leaks || check->check_errors)) { @@ -601,6 +630,10 @@ static void dump_human_image_check(ImageCheck *check, = bool quiet) qprintf(quiet, "Image end offset: %" PRId64 "\n", check->image_end_offset= ); } + + if (check->has_format_alloc_info) { + dump_human_format_alloc_info(check->format_alloc_info, quiet); + } } =20 static int collect_image_check(BlockDriverState *bs, @@ -611,6 +644,7 @@ static int collect_image_check(BlockDriverState *bs, { int ret; BdrvCheckResult result; + BlockFormatAllocInfo *bfai =3D g_new0(BlockFormatAllocInfo, 1); =20 ret =3D bdrv_check(bs, &result, fix); if (ret < 0) { @@ -639,6 +673,14 @@ static int collect_image_check(BlockDriverState *bs, check->compressed_clusters =3D result.bfi.compressed_clusters; check->has_compressed_clusters =3D result.bfi.compressed_clusters != =3D 0; =20 + ret =3D bdrv_get_format_alloc_stat(bs, bfai); + if (ret < 0) { + qapi_free_BlockFormatAllocInfo(bfai); + } else { + check->has_format_alloc_info =3D true; + check->format_alloc_info =3D bfai; + } + return 0; } =20 --=20 2.11.1