[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/50] error: Include the program name in error mess
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 19/50] error: Include the program name in error messages to stderr |
Date: |
Thu, 4 Mar 2010 16:56:40 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
---
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
- [Qemu-devel] [PATCH 42/50] error: New QERR_NO_BUS_FOR_DEVICE, (continued)
- [Qemu-devel] [PATCH 49/50] monitor: Use argument type 'O' for device_add, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 47/50] qemu-option: Rename find_list() to qemu_find_opts() & external linkage, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 16/50] error: Replace qemu_error() by error_report(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 24/50] qdev: Factor qdev_create_from_info() out of qdev_create(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 19/50] error: Include the program name in error messages to stderr,
Markus Armbruster <=
- [Qemu-devel] [PATCH 38/50] error: New error_printf_unless_qmp(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 20/50] error: Track locations in configuration files, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 46/50] qemu-option: Move the implied first name into QemuOptsList, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 22/50] error: Track locations on command line, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 48/50] monitor: New argument type 'O', Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 29/50] error: Polish human-readable error descriptions, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 21/50] QemuOpts: Fix qemu_config_parse() to catch file read errors, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 32/50] qdev: convert setting device properties to QError, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 28/50] error: Let converted handlers print in human monitor, Markus Armbruster, 2010/03/04