Max Reitz <[email protected]> writes: > 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 <[email protected]> > --- > As the old code deliberately emitted the error only in case of > human-readable output, I asked Federico, the original author, for his > opinion in https://bugzilla.redhat.com/show_bug.cgi?id=1054753, but did > not receive a reply so far. > --- > qemu-img.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/qemu-img.c b/qemu-img.c > index d118da5..b3d2bc6 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;
Undocumented return code. Care to fix that, too? > goto fail; > } Reviewed-by: Markus Armbruster <[email protected]>
