On Fri, Feb 08, 2013 at 09:33:43AM +0100, Miroslav Rezanina wrote: > @@ -86,6 +87,7 @@ static void help(void) > " rebasing in this case (useful for renaming the backing > file)\n" > " '-h' with or without a command shows this help and lists the > supported formats\n" > " '-p' show progress of command (only certain commands)\n" > + " '-q' Quiet mode - do not print any output (except errors)\n"
When you rebase (see below), please s/Quiet/quiet/ since the other help messages start with lower case. > if (result.bfi.total_clusters != 0 && result.bfi.allocated_clusters != > 0) { > - printf("%" PRId64 "/%" PRId64 "= %0.2f%% allocated, %0.2f%% > fragmented\n", > + /* BEWARE: parameter list not indented due to long expressions */ > + qprintf(quiet, > + "%" PRId64 "/%" PRId64 "= %0.2f%% allocated, %0.2f%% fragmented\n", > result.bfi.allocated_clusters, result.bfi.total_clusters, > result.bfi.allocated_clusters * 100.0 / result.bfi.total_clusters, > result.bfi.fragmented_clusters * 100.0 / > result.bfi.allocated_clusters); This conflicts with kevin/block-next since Federico's qemu-img check json output series has been merged. Please rebase onto http://repo.or.cz/w/qemu/kevin.git block-next.