From nobody Sun Feb 8 01:26:39 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 1495726275957116.56742188030807; Thu, 25 May 2017 08:31:15 -0700 (PDT) Received: from localhost ([::1]:60526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDujK-0000oS-Ek for importer@patchew.org; Thu, 25 May 2017 11:31:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDufA-0004qI-KK 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-0002fw-Ik for qemu-devel@nongnu.org; Thu, 25 May 2017 11:26:56 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:47130 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-0002fD-6z 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 v4PFQS1t019102; 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:27 +0300 Message-Id: <20170525152628.37628-7-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 6/7] qemu-img check: add file-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" Add bdrv_getlength() of underlying bs->file->bs, to improve 'Format unallocated size' section of qemu-img check output. Signed-off-by: Vladimir Sementsov-Ogievskiy --- qapi/block-core.json | 2 +- qemu-img.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index c7ed5dc970..f720a29512 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -186,7 +186,7 @@ '*corruptions-fixed': 'int', '*leaks-fixed': 'int', '*total-clusters': 'int', '*allocated-clusters': 'int', '*fragmented-clusters': 'int', '*compressed-clusters': 'int', - '*format-unallocated-size': 'uint64'} } + '*format-unallocated-size': 'uint64', '*file-size': 'uint64'} } =20 ## # @MapEntry: diff --git a/qemu-img.c b/qemu-img.c index cbd09148d2..08a2b5ba54 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -603,10 +603,13 @@ static void dump_human_image_check(ImageCheck *check,= bool quiet) } =20 if (check->has_format_unallocated_size) { - char u_buf[128]; - qprintf(quiet, "Format unallocated size: %s\n", + char buf[128], u_buf[128]; + assert(check->has_file_size); + qprintf(quiet, "Format unallocated size: %s/%s =3D %0.2f%%\n", get_human_readable_size(u_buf, sizeof(u_buf), - check->format_unallocated_size)); + check->format_unallocated_size), + get_human_readable_size(buf, sizeof(buf), check->file_size= ), + check->format_unallocated_size * 100.0 / check->file_size); } } =20 @@ -650,6 +653,8 @@ static int collect_image_check(BlockDriverState *bs, int64_t file_size =3D bdrv_getlength(bs->file->bs); if (file_size >=3D 0) { int64_t format_allocated_size =3D bdrv_get_format_allocated_si= ze(bs); + check->file_size =3D file_size; + check->has_file_size =3D true; if (format_allocated_size >=3D 0) { check->format_unallocated_size =3D file_size - format_allocated_size; --=20 2.11.1