From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NnDXR-0005eY-RU for qemu-devel@nongnu.org; Thu, 04 Mar 2010 11:04:37 -0500 Received: from [199.232.76.173] (port=58573 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NnDXR-0005eD-4N for qemu-devel@nongnu.org; Thu, 04 Mar 2010 11:04:37 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NnDXM-0001P5-H2 for qemu-devel@nongnu.org; Thu, 04 Mar 2010 11:04:36 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:47480) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NnDXL-0001Od-Tu for qemu-devel@nongnu.org; Thu, 04 Mar 2010 11:04:32 -0500 Received: from blackfin.pond.sub.org (pD9E38041.dip.t-dialin.net [217.227.128.65]) by oxygen.pond.sub.org (Postfix) with ESMTPA id EC465276DA4 for ; Thu, 4 Mar 2010 17:04:29 +0100 (CET) From: Markus Armbruster Date: Thu, 4 Mar 2010 16:56:40 +0100 Message-Id: <1267718231-13303-20-git-send-email-armbru@redhat.com> In-Reply-To: <1267718231-13303-1-git-send-email-armbru@redhat.com> References: <1267718231-13303-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 19/50] error: Include the program name in error messages to stderr List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Luiz Capitulino Signed-off-by: Markus Armbruster --- qemu-error.c | 20 +++++++++++++++++++- qemu-error.h | 1 + vl.c | 2 ++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/qemu-error.c b/qemu-error.c index 0d673c5..214e448 100644 --- a/qemu-error.c +++ b/qemu-error.c @@ -113,13 +113,31 @@ void loc_set_none(void) cur_loc->kind = LOC_NONE; } +static const char *progname; + +/* + * Set the program name for error_print_loc(). + */ +void error_set_progname(const char *argv0) +{ + const char *p = strrchr(argv0, '/'); + progname = p ? p + 1 : argv0; +} + /* * Print current location to current monitor if we have one, else to stderr. */ void error_print_loc(void) { + const char *sep = ""; + + if (!cur_mon) { + fprintf(stderr, "%s:", progname); + sep = " "; + } switch (cur_loc->kind) { - default: ; + default: + error_printf(sep); } } diff --git a/qemu-error.h b/qemu-error.h index a1562aa..204dfb6 100644 --- a/qemu-error.h +++ b/qemu-error.h @@ -31,6 +31,7 @@ void loc_set_none(void); void error_vprintf(const char *fmt, va_list ap); void error_printf(const char *fmt, ...) __attribute__ ((format(printf, 1, 2))); void error_print_loc(void); +void error_set_progname(const char *argv0); void error_report(const char *fmt, ...) __attribute__ ((format(printf, 1, 2))); void qerror_report_internal(const char *file, int linenr, const char *func, const char *fmt, ...) diff --git a/vl.c b/vl.c index e8a368b..2ba8eda 100644 --- a/vl.c +++ b/vl.c @@ -4822,6 +4822,8 @@ int main(int argc, char **argv, char **envp) int show_vnc_port = 0; int defconfig = 1; + error_set_progname(argv[0]); + init_clocks(); qemu_cache_utils_init(envp); -- 1.6.6.1