Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE2BAC43331 for ; Tue, 24 Mar 2020 17:33:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 77DF92076E for ; Tue, 24 Mar 2020 17:33:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hTpqwxZL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 77DF92076E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGnQK-0004fX-Kw for qemu-devel@archiver.kernel.org; Tue, 24 Mar 2020 13:33:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56745) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGnLV-0006l6-2e for qemu-devel@nongnu.org; Tue, 24 Mar 2020 13:28:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGnLT-0001oD-Kv for qemu-devel@nongnu.org; Tue, 24 Mar 2020 13:28:08 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:39449) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGnLT-0001nv-Gu for qemu-devel@nongnu.org; Tue, 24 Mar 2020 13:28:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585070886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WI7w6E7uZqMOpY9Yayp3mN1+R7qny26/dAzMjT9Pi8E=; b=hTpqwxZLOLk0hTt3rq5oTmRzWuGePl9oK/5RHMdcxNbYBPTCO3r6qE+8zpOrlA+uLaCzOz mDKrfI7SVUQZQlAayPkuSJKKJeb9TmQvqrtx9+qmbCL7SygCpQ2pKN0/gXSkmNO9AeDK+C E60yYSKN5cpZDdi/2LLC2yR8PPXlnOQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-273-Q6m3dtpGMea8PH1E4iQGgQ-1; Tue, 24 Mar 2020 13:28:04 -0400 X-MC-Unique: Q6m3dtpGMea8PH1E4iQGgQ-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 28EB913F9; Tue, 24 Mar 2020 17:28:03 +0000 (UTC) Received: from localhost (ovpn-114-213.ams2.redhat.com [10.36.114.213]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BC9DA5C1A0; Tue, 24 Mar 2020 17:28:02 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH for-5.0 v2 1/3] qemu-img: Fix check's leak/corruption fix report Date: Tue, 24 Mar 2020 18:27:55 +0100 Message-Id: <20200324172757.1173824-2-mreitz@redhat.com> In-Reply-To: <20200324172757.1173824-1-mreitz@redhat.com> References: <20200324172757.1173824-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 216.205.24.74 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" There are two problems with qemu-img check's report on how many leaks and/or corruptions have been fixed: (1) ImageCheck.has_leaks_fixed and ImageCheck.has_corruptions_fixed are only true when ImageCheck.leaks or ImageCheck.corruptions (respectively) are non-zero. qcow2's check implementation will set the latter to zero after it has fixed leaks and corruptions, though, so leaks-fixed and corruptions-fixed are actually never reported after successful repairs. We should always report them when they are non-zero, just like all the other fields of ImageCheck. (2) After something has been fixed and we run the check a second time, leaks_fixed and corruptions_fixed are taken from the first run; but has_leaks_fixed and has_corruptions_fixed are not. The second run actually cannot fix anything, so with (1) fixed, has_leaks_fixed and has_corruptions_fixed will always be false here. (With (1) unfixed, they will at least be false on successful runs, because then the number of leaks and corruptions found in the second run should be 0.) We should save has_leaks_fixed and has_corruptions_fixed just like we save leaks_fixed and corruptions_fixed. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- qemu-img.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index afddf33f08..b167376bd7 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -647,9 +647,9 @@ static int collect_image_check(BlockDriverState *bs, check->leaks =3D result.leaks; check->has_leaks =3D result.leaks !=3D 0; check->corruptions_fixed =3D result.corruptions_fixed; - check->has_corruptions_fixed =3D result.corruptions !=3D 0; + check->has_corruptions_fixed =3D result.corruptions_fixed !=3D 0; check->leaks_fixed =3D result.leaks_fixed; - check->has_leaks_fixed =3D result.leaks !=3D 0; + check->has_leaks_fixed =3D result.leaks_fixed !=3D 0; check->image_end_offset =3D result.image_end_offset; check->has_image_end_offset =3D result.image_end_offset !=3D 0; check->total_clusters =3D result.bfi.total_clusters; @@ -803,9 +803,12 @@ static int img_check(int argc, char **argv) =20 if (check->corruptions_fixed || check->leaks_fixed) { int corruptions_fixed, leaks_fixed; + bool has_leaks_fixed, has_corruptions_fixed; =20 leaks_fixed =3D check->leaks_fixed; + has_leaks_fixed =3D check->has_leaks_fixed; corruptions_fixed =3D check->corruptions_fixed; + has_corruptions_fixed =3D check->has_corruptions_fixed; =20 if (output_format =3D=3D OFORMAT_HUMAN) { qprintf(quiet, @@ -822,7 +825,9 @@ static int img_check(int argc, char **argv) ret =3D collect_image_check(bs, check, filename, fmt, 0); =20 check->leaks_fixed =3D leaks_fixed; + check->has_leaks_fixed =3D has_leaks_fixed; check->corruptions_fixed =3D corruptions_fixed; + check->has_corruptions_fixed =3D has_corruptions_fixed; } =20 if (!ret) { --=20 2.25.1