qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: stefanha@gmail.com
Subject: [Qemu-devel] [PATCH trivial 3/5] qemu-img: Don't prepend qemu-img to error messages twice.
Date: Wed, 22 Jun 2011 14:03:55 +0200	[thread overview]
Message-ID: <1308744237-3468-4-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1308744237-3468-1-git-send-email-armbru@redhat.com>

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>
---
 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.2.3

  parent reply	other threads:[~2011-06-22 12:04 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-22 12:03 [Qemu-devel] [PATCH trivial 0/5] Fix error_report() calls Markus Armbruster
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 1/5] sheepdog: qemu_bh_new() can't return null pointer, drop check Markus Armbruster
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 2/5] Strip trailing '\n' from error_report()'s first argument Markus Armbruster
2011-06-22 12:03 ` Markus Armbruster [this message]
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 4/5] Spell "unkown" correctly in error_report() arguments Markus Armbruster
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 5/5] blockdev: Put space after comma in error message Markus Armbruster
2011-06-22 12:41 ` [Qemu-devel] [PATCH trivial 0/5] Fix error_report() calls Anthony Liguori
2011-06-23 13:33 ` Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1308744237-3468-4-git-send-email-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).