From d876f60d14d491c27719bafeaed21669e15348a3 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Fri, 21 Mar 2014 19:42:22 -0400 Subject: error: Privatize error_print_loc Cc: Luiz Capitulino Cc: Markus Armbruster Signed-off-by: Cole Robinson Reviewed-by: Paolo Bonzini Signed-off-by: Luiz Capitulino --- util/qemu-error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/qemu-error.c') diff --git a/util/qemu-error.c b/util/qemu-error.c index fec02c6075..80df49a874 100644 --- a/util/qemu-error.c +++ b/util/qemu-error.c @@ -165,7 +165,7 @@ const char *error_get_progname(void) /* * Print current location to current monitor if we have one, else to stderr. */ -void error_print_loc(void) +static void error_print_loc(void) { const char *sep = ""; int i; -- cgit v1.2.3-55-g7522 From 4ad417baa43424b6b988c52b83989fd95670c113 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Fri, 21 Mar 2014 19:42:24 -0400 Subject: error: Print error_report() to stderr if using qmp monitor_printf will drop the requested output if cur_mon is qmp (for good reason). However these messages are often helpful for debugging issues with via libvirt. If we know the message won't hit the monitor, send it to stderr. Cc: Luiz Capitulino Cc: Markus Armbruster Signed-off-by: Cole Robinson Reviewed-by: Paolo Bonzini Signed-off-by: Luiz Capitulino --- util/qemu-error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/qemu-error.c') diff --git a/util/qemu-error.c b/util/qemu-error.c index 80df49a874..7b167fd06b 100644 --- a/util/qemu-error.c +++ b/util/qemu-error.c @@ -20,7 +20,7 @@ */ void error_vprintf(const char *fmt, va_list ap) { - if (cur_mon) { + if (cur_mon && !monitor_cur_is_qmp()) { monitor_vprintf(cur_mon, fmt, ap); } else { vfprintf(stderr, fmt, ap); -- cgit v1.2.3-55-g7522