From 55d492d7602c27cabb605f42e72c755de1c186c1 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Sat, 31 May 2014 21:33:30 +0200 Subject: [PATCH] qemu-img: Report error even with --oformat=json img_check() should report that the format of the given image does not support checks even if JSON output is desired. JSON data is output to stdout, as opposed to error messages, which are (in the case of qemu-img) printed to stderr. Therefore, it is easy to distinguish between the two. Also, img_info() does already use error_report() for human-readable messages even though JSON output is desired (through collect_image_info_list()). Signed-off-by: Max Reitz Reviewed-by: Markus Armbruster Signed-off-by: Kevin Wolf --- qemu-img.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index d118da5c2f..b3d2bc6f02 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -663,9 +663,7 @@ static int img_check(int argc, char **argv) ret = collect_image_check(bs, check, filename, fmt, fix); if (ret == -ENOTSUP) { - if (output_format == OFORMAT_HUMAN) { - error_report("This image format does not support checks"); - } + error_report("This image format does not support checks"); ret = 63; goto fail; } -- 2.11.4.GIT