Commit 9d42e15d authored by Markus Armbruster's avatar Markus Armbruster Committed by Stefan Hajnoczi

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: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
parent 6daf194d
......@@ -304,11 +304,11 @@ static int img_create(int argc, char **argv)
fmt = optarg;
break;
case 'e':
error_report("qemu-img: option -e is deprecated, please use \'-o "
error_report("option -e is deprecated, please use \'-o "
"encryption\' instead!");
return 1;
case '6':
error_report("qemu-img: option -6 is deprecated, please use \'-o "
error_report("option -6 is deprecated, please use \'-o "
"compat6\' instead!");
return 1;
case 'o':
......@@ -633,11 +633,11 @@ static int img_convert(int argc, char **argv)
compress = 1;
break;
case 'e':
error_report("qemu-img: option -e is deprecated, please use \'-o "
error_report("option -e is deprecated, please use \'-o "
"encryption\' instead!");
return 1;
case '6':
error_report("qemu-img: option -6 is deprecated, please use \'-o "
error_report("option -6 is deprecated, please use \'-o "
"compat6\' instead!");
return 1;
case 'o':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment