qemu-img: Print error if check failed
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 <mreitz@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
3cad83075c
commit
832390a5ed
@ -687,6 +687,7 @@ static int img_check(int argc, char **argv)
|
||||
check->corruptions_fixed = corruptions_fixed;
|
||||
}
|
||||
|
||||
if (!ret) {
|
||||
switch (output_format) {
|
||||
case OFORMAT_HUMAN:
|
||||
dump_human_image_check(check, quiet);
|
||||
@ -695,8 +696,14 @@ static int img_check(int argc, char **argv)
|
||||
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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user