From: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, stefanha@gmail.com, lcapitulino@redhat.com,
pbonzini@redhat.com, Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH 09/13] error: print progname with error_vprintf()
Date: Fri, 18 Oct 2013 09:11:17 +0800 [thread overview]
Message-ID: <1382058681-14957-10-git-send-email-xiawenc@linux.vnet.ibm.com> (raw)
In-Reply-To: <1382058681-14957-1-git-send-email-xiawenc@linux.vnet.ibm.com>
This remove additional code path about where to print the error,
error_vprintf() is only the controller now, making future change
easier.
The logic is not changed since when cur_mon = NULL, error_vprintf()
will still print to stderr.
Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
---
util/qemu-error.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/util/qemu-error.c b/util/qemu-error.c
index d1e858a..c29fcbd 100644
--- a/util/qemu-error.c
+++ b/util/qemu-error.c
@@ -151,6 +151,15 @@ const char *error_get_progname(void)
return progname;
}
+static void error_print_progname(const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ error_vprintf(fmt, ap);
+ va_end(ap);
+}
+
/*
* Print current location to current monitor if we have one, else to stderr.
*/
@@ -161,7 +170,7 @@ static void error_print_loc(void)
const char *const *argp;
if (!cur_mon && progname) {
- fprintf(stderr, "%s: ", progname);
+ error_print_progname("%s: ", progname);
}
switch (cur_loc->kind) {
case LOC_CMDLINE:
--
1.7.1
next prev parent reply other threads:[~2013-10-18 9:12 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-18 1:11 [Qemu-devel] [PATCH 00/13] trivial patches for event, error and monitor Wenchao Xia
2013-10-18 1:11 ` [Qemu-devel] [PATCH 01/13] block: use type MonitorEvent directly Wenchao Xia
2013-10-18 1:11 ` [Qemu-devel] [PATCH 02/13] block: do not include monitor.h in block.c Wenchao Xia
2013-10-18 9:36 ` Paolo Bonzini
2013-10-21 2:43 ` Wenchao Xia
2013-10-18 1:11 ` [Qemu-devel] [PATCH 03/13] qapi: move MonitorEvent define Wenchao Xia
2013-10-18 9:36 ` Paolo Bonzini
2013-10-18 12:38 ` Eric Blake
2013-10-21 2:44 ` Wenchao Xia
2013-10-18 1:11 ` [Qemu-devel] [PATCH 04/13] qapi: rename MonitorEvent to QEvent Wenchao Xia
2013-10-18 1:11 ` [Qemu-devel] [PATCH 05/13] error: define struct Error in only one place Wenchao Xia
2013-10-18 9:37 ` Paolo Bonzini
2013-10-18 11:22 ` Markus Armbruster
2013-10-21 2:46 ` Wenchao Xia
2013-10-18 1:11 ` [Qemu-devel] [PATCH 06/13] error: remove error_printf_unless_qmp() Wenchao Xia
2013-10-18 9:39 ` Paolo Bonzini
2013-10-18 11:29 ` Markus Armbruster
2013-10-18 1:11 ` [Qemu-devel] [PATCH 07/13] error: make error_print_loc() static Wenchao Xia
2013-10-18 12:39 ` Eric Blake
2013-10-18 1:11 ` [Qemu-devel] [PATCH 08/13] error: don't set sep when print progname Wenchao Xia
2013-10-18 9:43 ` Paolo Bonzini
2013-10-18 11:40 ` Markus Armbruster
2013-10-21 3:31 ` Wenchao Xia
2013-10-18 1:11 ` Wenchao Xia [this message]
2013-10-18 9:44 ` [Qemu-devel] [PATCH 09/13] error: print progname with error_vprintf() Paolo Bonzini
2013-10-21 3:33 ` Wenchao Xia
2013-10-18 1:11 ` [Qemu-devel] [PATCH 10/13] qerror: deref once in qerror_report() Wenchao Xia
2013-10-18 9:46 ` Paolo Bonzini
2013-10-21 3:35 ` Wenchao Xia
2013-10-18 1:11 ` [Qemu-devel] [PATCH 11/13] qerror: folder qerror emit logic Wenchao Xia
2013-10-18 9:49 ` Paolo Bonzini
2013-10-18 1:11 ` [Qemu-devel] [PATCH 12/13] monitor: hide *cur_mon in monitor_get_fd() Wenchao Xia
2013-10-18 9:51 ` Paolo Bonzini
2013-10-21 3:36 ` Wenchao Xia
2013-10-18 1:11 ` [Qemu-devel] [PATCH 13/13] stubs: do not call monitor_printf() Wenchao Xia
2013-10-18 9:52 ` Paolo Bonzini
2013-10-21 6:04 ` Wenchao Xia
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=1382058681-14957-10-git-send-email-xiawenc@linux.vnet.ibm.com \
--to=xiawenc@linux.vnet.ibm.com \
--cc=kwolf@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=pbonzini@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).