From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53113) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhISJ-0002Ww-IS for qemu-devel@nongnu.org; Thu, 23 Oct 2014 09:29:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XhISB-0005I9-1e for qemu-devel@nongnu.org; Thu, 23 Oct 2014 09:29:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51055) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhISA-0005I5-QC for qemu-devel@nongnu.org; Thu, 23 Oct 2014 09:29:22 -0400 From: Max Reitz Date: Thu, 23 Oct 2014 15:29:12 +0200 Message-Id: <1414070952-25865-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH] qemu-img: Print error if check failed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Lieven , Max Reitz , Stefan Hajnoczi , =?UTF-8?q?Beno=C3=AEt=20Canet?= Currently, if bdrv_check() fails either by returning -errno or having check_errors set, qemu-img check just exits with 1 after having told the user that there were no errors on the image. This is bad. Instead of printing the check result if there were internal errors which were so bad that bdrv_check() could not even complete with 0 as a return value, qemu-img check should inform the user about the error. Signed-off-by: Max Reitz --- qemu-img.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 09e7e72..731502c 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -687,16 +687,23 @@ static int img_check(int argc, char **argv) check->corruptions_fixed = corruptions_fixed; } - switch (output_format) { - case OFORMAT_HUMAN: - dump_human_image_check(check, quiet); - break; - case OFORMAT_JSON: - dump_json_image_check(check, quiet); - break; + if (!ret) { + switch (output_format) { + case OFORMAT_HUMAN: + dump_human_image_check(check, quiet); + break; + case OFORMAT_JSON: + dump_json_image_check(check, quiet); + break; + } } if (ret || check->check_errors) { + if (ret) { + error_report("Check failed: %s", strerror(-ret)); + } else { + error_report("Check failed"); + } ret = 1; goto fail; } -- 1.9.3