From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:46503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa9hK-0004Ts-0E for qemu-devel@nongnu.org; Fri, 24 Jun 2011 12:57:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qa9hI-0001WM-F7 for qemu-devel@nongnu.org; Fri, 24 Jun 2011 12:57:37 -0400 Received: from mail-fx0-f45.google.com ([209.85.161.45]:58586) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa9hI-0001W2-05 for qemu-devel@nongnu.org; Fri, 24 Jun 2011 12:57:36 -0400 Received: by fxg12 with SMTP id 12so94462fxg.4 for ; Fri, 24 Jun 2011 09:57:34 -0700 (PDT) From: Stefan Hajnoczi Date: Fri, 24 Jun 2011 17:56:41 +0100 Message-Id: <1308934609-20824-6-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1308934609-20824-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1308934609-20824-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 05/13] qemu-img: Don't prepend qemu-img to error messages twice. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Markus Armbruster , Stefan Hajnoczi From: Markus Armbruster 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 Signed-off-by: Stefan Hajnoczi --- qemu-img.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 1a37828..32628b3 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -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': -- 1.7.5.4