ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-img: Don't prepend qemu-img to error messages twice. 

error_report() prepends the location already.  Example:

$ qemu-img convert -6
qemu-img: qemu-img: option -6 is deprecated, please use '-o compat6' instead!

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
This commit is contained in:
Markus Armbruster 2011-06-22 14:03:55 +02:00 committed by Stefan Hajnoczi
parent 6daf194dde
commit 9d42e15dc9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qemu-img.c
View File

@ -304,11 +304,11 @@ static int img_create(int argc, char **argv)
fmt = optarg; fmt = optarg;
break; break;
case 'e': case 'e':
error_report("qemu-img: option -e is deprecated, please use \'-o " error_report("option -e is deprecated, please use \'-o "
"encryption\' instead!"); "encryption\' instead!");
return 1; return 1;
case '6': case '6':
error_report("qemu-img: option -6 is deprecated, please use \'-o " error_report("option -6 is deprecated, please use \'-o "
"compat6\' instead!"); "compat6\' instead!");
return 1; return 1;
case 'o': case 'o':
@ -633,11 +633,11 @@ static int img_convert(int argc, char **argv)
compress = 1; compress = 1;
break; break;
case 'e': case 'e':
error_report("qemu-img: option -e is deprecated, please use \'-o " error_report("option -e is deprecated, please use \'-o "
"encryption\' instead!"); "encryption\' instead!");
return 1; return 1;
case '6': case '6':
error_report("qemu-img: option -6 is deprecated, please use \'-o " error_report("option -6 is deprecated, please use \'-o "
"compat6\' instead!"); "compat6\' instead!");
return 1; return 1;
case 'o': case 'o':