From nobody Wed Nov 5 17:32:56 2025 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 1496766540702138.50566087866866; Tue, 6 Jun 2017 09:29:00 -0700 (PDT) Received: from localhost ([::1]:39265 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIHLf-00015q-Vk for importer@patchew.org; Tue, 06 Jun 2017 12:28:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIHK6-00083l-6e for qemu-devel@nongnu.org; Tue, 06 Jun 2017 12:27:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIHK3-0002Q6-3B for qemu-devel@nongnu.org; Tue, 06 Jun 2017 12:27:14 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:23806 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 1dIHK2-0002Pp-Ns for qemu-devel@nongnu.org; Tue, 06 Jun 2017 12:27:11 -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 v56GQq4F001574; Tue, 6 Jun 2017 19:26:54 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 6 Jun 2017 19:26:52 +0300 Message-Id: <20170606162652.112122-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170606162652.112122-1-vsementsov@virtuozzo.com> References: <20170606162652.112122-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 v3 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 fd7b52bd69..b9b9952541 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -232,6 +232,9 @@ # field is present if the driver for the image format # supports it # +# @format-alloc-info: Format-allocation information, see +# BlockFormatAllocInfo description. (Since: 2.10) +# # Since: 1.4 # ## @@ -240,7 +243,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