2010-02-18 17:14:17 +01:00
|
|
|
/*
|
|
|
|
* Error reporting
|
|
|
|
*
|
|
|
|
* Copyright (C) 2010 Red Hat Inc.
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Markus Armbruster <armbru@redhat.com>,
|
|
|
|
*
|
|
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
|
|
* See the COPYING file in the top-level directory.
|
|
|
|
*/
|
|
|
|
|
2016-01-29 18:49:55 +01:00
|
|
|
#include "qemu/osdep.h"
|
2012-12-17 18:19:49 +01:00
|
|
|
#include "monitor/monitor.h"
|
2015-03-17 18:29:20 +01:00
|
|
|
#include "qemu/error-report.h"
|
2010-02-17 10:55:46 +01:00
|
|
|
|
2017-07-12 15:57:36 +02:00
|
|
|
/*
|
|
|
|
* @report_type is the type of message: error, warning or
|
|
|
|
* informational.
|
|
|
|
*/
|
|
|
|
typedef enum {
|
|
|
|
REPORT_TYPE_ERROR,
|
|
|
|
REPORT_TYPE_WARNING,
|
|
|
|
REPORT_TYPE_INFO,
|
|
|
|
} report_type;
|
|
|
|
|
2019-10-10 10:15:08 +02:00
|
|
|
/* Prepend timestamp to messages */
|
2021-01-25 12:35:06 +01:00
|
|
|
bool message_with_timestamp;
|
2020-06-26 22:19:00 +02:00
|
|
|
bool error_with_guestname;
|
|
|
|
const char *error_guest_name;
|
2019-10-10 10:15:08 +02:00
|
|
|
|
2019-04-17 21:06:36 +02:00
|
|
|
int error_printf(const char *fmt, ...)
|
2010-02-18 17:14:17 +01:00
|
|
|
{
|
|
|
|
va_list ap;
|
2019-04-17 21:06:36 +02:00
|
|
|
int ret;
|
2010-02-18 17:14:17 +01:00
|
|
|
|
|
|
|
va_start(ap, fmt);
|
2019-04-17 21:06:36 +02:00
|
|
|
ret = error_vprintf(fmt, ap);
|
2010-02-18 17:14:17 +01:00
|
|
|
va_end(ap);
|
2019-04-17 21:06:36 +02:00
|
|
|
return ret;
|
2010-02-18 17:14:17 +01:00
|
|
|
}
|
|
|
|
|
2010-02-18 19:46:49 +01:00
|
|
|
static Location std_loc = {
|
|
|
|
.kind = LOC_NONE
|
|
|
|
};
|
|
|
|
static Location *cur_loc = &std_loc;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Push location saved in LOC onto the location stack, return it.
|
|
|
|
* The top of that stack is the current location.
|
|
|
|
* Needs a matching loc_pop().
|
|
|
|
*/
|
|
|
|
Location *loc_push_restore(Location *loc)
|
|
|
|
{
|
|
|
|
assert(!loc->prev);
|
|
|
|
loc->prev = cur_loc;
|
|
|
|
cur_loc = loc;
|
|
|
|
return loc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize *LOC to "nowhere", push it onto the location stack.
|
|
|
|
* The top of that stack is the current location.
|
|
|
|
* Needs a matching loc_pop().
|
|
|
|
* Return LOC.
|
|
|
|
*/
|
|
|
|
Location *loc_push_none(Location *loc)
|
|
|
|
{
|
|
|
|
loc->kind = LOC_NONE;
|
|
|
|
loc->prev = NULL;
|
|
|
|
return loc_push_restore(loc);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Pop the location stack.
|
|
|
|
* LOC must be the current location, i.e. the top of the stack.
|
|
|
|
*/
|
|
|
|
Location *loc_pop(Location *loc)
|
|
|
|
{
|
|
|
|
assert(cur_loc == loc && loc->prev);
|
|
|
|
cur_loc = loc->prev;
|
|
|
|
loc->prev = NULL;
|
|
|
|
return loc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Save the current location in LOC, return LOC.
|
|
|
|
*/
|
|
|
|
Location *loc_save(Location *loc)
|
|
|
|
{
|
|
|
|
*loc = *cur_loc;
|
|
|
|
loc->prev = NULL;
|
|
|
|
return loc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Change the current location to the one saved in LOC.
|
|
|
|
*/
|
|
|
|
void loc_restore(Location *loc)
|
|
|
|
{
|
|
|
|
Location *prev = cur_loc->prev;
|
|
|
|
assert(!loc->prev);
|
|
|
|
*cur_loc = *loc;
|
|
|
|
cur_loc->prev = prev;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Change the current location to "nowhere in particular".
|
|
|
|
*/
|
|
|
|
void loc_set_none(void)
|
|
|
|
{
|
|
|
|
cur_loc->kind = LOC_NONE;
|
|
|
|
}
|
|
|
|
|
2010-02-18 20:13:51 +01:00
|
|
|
/*
|
|
|
|
* Change the current location to argument ARGV[IDX..IDX+CNT-1].
|
|
|
|
*/
|
|
|
|
void loc_set_cmdline(char **argv, int idx, int cnt)
|
|
|
|
{
|
|
|
|
cur_loc->kind = LOC_CMDLINE;
|
|
|
|
cur_loc->num = cnt;
|
|
|
|
cur_loc->ptr = argv + idx;
|
|
|
|
}
|
|
|
|
|
2010-02-18 19:48:33 +01:00
|
|
|
/*
|
|
|
|
* Change the current location to file FNAME, line LNO.
|
|
|
|
*/
|
|
|
|
void loc_set_file(const char *fname, int lno)
|
|
|
|
{
|
|
|
|
assert (fname || cur_loc->kind == LOC_FILE);
|
|
|
|
cur_loc->kind = LOC_FILE;
|
|
|
|
cur_loc->num = lno;
|
|
|
|
if (fname) {
|
|
|
|
cur_loc->ptr = fname;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-02-18 19:46:49 +01:00
|
|
|
/*
|
|
|
|
* Print current location to current monitor if we have one, else to stderr.
|
|
|
|
*/
|
2017-07-12 15:57:31 +02:00
|
|
|
static void print_loc(void)
|
2010-02-18 19:46:49 +01:00
|
|
|
{
|
2010-02-24 14:37:14 +01:00
|
|
|
const char *sep = "";
|
2010-02-18 20:13:51 +01:00
|
|
|
int i;
|
|
|
|
const char *const *argp;
|
2010-02-24 14:37:14 +01:00
|
|
|
|
2022-02-21 11:11:47 +01:00
|
|
|
if (!monitor_cur() && g_get_prgname()) {
|
2022-03-23 16:57:26 +01:00
|
|
|
error_printf("%s:", g_get_prgname());
|
2010-02-24 14:37:14 +01:00
|
|
|
sep = " ";
|
|
|
|
}
|
2010-02-18 19:46:49 +01:00
|
|
|
switch (cur_loc->kind) {
|
2010-02-18 20:13:51 +01:00
|
|
|
case LOC_CMDLINE:
|
|
|
|
argp = cur_loc->ptr;
|
|
|
|
for (i = 0; i < cur_loc->num; i++) {
|
|
|
|
error_printf("%s%s", sep, argp[i]);
|
|
|
|
sep = " ";
|
|
|
|
}
|
|
|
|
error_printf(": ");
|
|
|
|
break;
|
2010-02-18 19:48:33 +01:00
|
|
|
case LOC_FILE:
|
|
|
|
error_printf("%s:", (const char *)cur_loc->ptr);
|
|
|
|
if (cur_loc->num) {
|
|
|
|
error_printf("%d:", cur_loc->num);
|
|
|
|
}
|
|
|
|
error_printf(" ");
|
|
|
|
break;
|
2010-02-24 14:37:14 +01:00
|
|
|
default:
|
2010-03-23 16:13:03 +01:00
|
|
|
error_printf("%s", sep);
|
2010-02-18 19:46:49 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-03-23 16:57:24 +01:00
|
|
|
static char *
|
|
|
|
real_time_iso8601(void)
|
|
|
|
{
|
2022-04-20 15:25:45 +02:00
|
|
|
#if GLIB_CHECK_VERSION(2,62,0)
|
2022-04-24 12:50:35 +02:00
|
|
|
g_autoptr(GDateTime) dt = g_date_time_new_now_utc();
|
2022-04-20 15:25:45 +02:00
|
|
|
/* ignore deprecation warning, since GLIB_VERSION_MAX_ALLOWED is 2.56 */
|
|
|
|
#pragma GCC diagnostic push
|
|
|
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
2022-03-23 16:57:24 +01:00
|
|
|
return g_date_time_format_iso8601(dt);
|
2022-04-20 15:25:45 +02:00
|
|
|
#pragma GCC diagnostic pop
|
2022-03-23 16:57:24 +01:00
|
|
|
#else
|
|
|
|
GTimeVal tv;
|
|
|
|
g_get_current_time(&tv);
|
|
|
|
return g_time_val_to_iso8601(&tv);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2010-02-18 17:25:24 +01:00
|
|
|
/*
|
2017-07-12 15:57:36 +02:00
|
|
|
* Print a message to current monitor if we have one, else to stderr.
|
|
|
|
* @report_type is the type of message: error, warning or informational.
|
2015-12-18 16:35:08 +01:00
|
|
|
* Format arguments like vsprintf(). The resulting message should be
|
|
|
|
* a single phrase, with no newline or trailing punctuation.
|
2010-02-18 19:46:49 +01:00
|
|
|
* Prepend the current location and append a newline.
|
2010-02-18 17:25:24 +01:00
|
|
|
*/
|
2017-07-12 15:57:36 +02:00
|
|
|
static void vreport(report_type type, const char *fmt, va_list ap)
|
2010-02-18 17:14:17 +01:00
|
|
|
{
|
2013-07-04 05:02:46 +02:00
|
|
|
gchar *timestr;
|
|
|
|
|
2021-01-25 12:35:06 +01:00
|
|
|
if (message_with_timestamp && !monitor_cur()) {
|
2022-03-23 16:57:24 +01:00
|
|
|
timestr = real_time_iso8601();
|
2017-07-19 09:33:34 +02:00
|
|
|
error_printf("%s ", timestr);
|
|
|
|
g_free(timestr);
|
|
|
|
}
|
|
|
|
|
2020-06-26 22:19:00 +02:00
|
|
|
/* Only prepend guest name if -msg guest-name and -name guest=... are set */
|
2020-10-05 17:58:44 +02:00
|
|
|
if (error_with_guestname && error_guest_name && !monitor_cur()) {
|
2020-06-26 22:19:00 +02:00
|
|
|
error_printf("%s ", error_guest_name);
|
|
|
|
}
|
|
|
|
|
2017-07-19 09:33:34 +02:00
|
|
|
print_loc();
|
|
|
|
|
2017-07-12 15:57:36 +02:00
|
|
|
switch (type) {
|
|
|
|
case REPORT_TYPE_ERROR:
|
|
|
|
break;
|
|
|
|
case REPORT_TYPE_WARNING:
|
|
|
|
error_printf("warning: ");
|
|
|
|
break;
|
|
|
|
case REPORT_TYPE_INFO:
|
|
|
|
error_printf("info: ");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2010-02-18 17:14:17 +01:00
|
|
|
error_vprintf(fmt, ap);
|
2010-02-18 17:25:24 +01:00
|
|
|
error_printf("\n");
|
2010-02-17 10:55:46 +01:00
|
|
|
}
|
2014-10-08 14:11:54 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Print an error message to current monitor if we have one, else to stderr.
|
2017-07-12 15:57:36 +02:00
|
|
|
* Format arguments like vsprintf(). The resulting message should be
|
|
|
|
* a single phrase, with no newline or trailing punctuation.
|
|
|
|
* Prepend the current location and append a newline.
|
|
|
|
* It's wrong to call this in a QMP monitor. Use error_setg() there.
|
|
|
|
*/
|
|
|
|
void error_vreport(const char *fmt, va_list ap)
|
|
|
|
{
|
|
|
|
vreport(REPORT_TYPE_ERROR, fmt, ap);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Print a warning message to current monitor if we have one, else to stderr.
|
|
|
|
* Format arguments like vsprintf(). The resulting message should be
|
|
|
|
* a single phrase, with no newline or trailing punctuation.
|
|
|
|
* Prepend the current location and append a newline.
|
|
|
|
*/
|
|
|
|
void warn_vreport(const char *fmt, va_list ap)
|
|
|
|
{
|
|
|
|
vreport(REPORT_TYPE_WARNING, fmt, ap);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Print an information message to current monitor if we have one, else to
|
|
|
|
* stderr.
|
|
|
|
* Format arguments like vsprintf(). The resulting message should be
|
|
|
|
* a single phrase, with no newline or trailing punctuation.
|
|
|
|
* Prepend the current location and append a newline.
|
|
|
|
*/
|
|
|
|
void info_vreport(const char *fmt, va_list ap)
|
|
|
|
{
|
|
|
|
vreport(REPORT_TYPE_INFO, fmt, ap);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Print an error message to current monitor if we have one, else to stderr.
|
|
|
|
* Format arguments like sprintf(). The resulting message should be
|
|
|
|
* a single phrase, with no newline or trailing punctuation.
|
2014-10-08 14:11:54 +02:00
|
|
|
* Prepend the current location and append a newline.
|
qmp: Wean off qerror_report()
The traditional QMP command handler interface
int qmp_FOO(Monitor *mon, const QDict *params, QObject **ret_data);
doesn't provide for returning an Error object. Instead, the handler
is expected to stash it in the monitor with qerror_report().
When we rebased QMP on top of QAPI, we didn't change this interface.
Instead, commit 776574d introduced "middle mode" as a temporary aid
for converting existing QMP commands to QAPI one by one. More than
three years later, we're still using it.
Middle mode has two effects:
* Instead of the native input marshallers
static void qmp_marshal_input_FOO(QDict *, QObject **, Error **)
it generates input marshallers conforming to the traditional QMP
command handler interface.
* It suppresses generation of code to register them with
qmp_register_command()
This permits giving them internal linkage.
As long as we need qmp-commands.hx, we can't use the registry behind
qmp_register_command(), so the latter has to stay for now.
The former has to go to get rid of qerror_report(). Changing all QMP
commands to fit the QAPI mold in one go was impractical back when we
started, but by now there are just a few stragglers left:
do_qmp_capabilities(), qmp_qom_set(), qmp_qom_get(), qmp_object_add(),
qmp_netdev_add(), do_device_add().
Switch middle mode to generate native input marshallers, and adapt the
stragglers. Simplifies both the monitor code and the stragglers.
Rename do_qmp_capabilities() to qmp_capabilities(), and
do_device_add() to qmp_device_add, because that's how QMP command
handlers are named today.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
2015-03-13 17:25:50 +01:00
|
|
|
* It's wrong to call this in a QMP monitor. Use error_setg() there.
|
2014-10-08 14:11:54 +02:00
|
|
|
*/
|
|
|
|
void error_report(const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
2017-07-12 15:57:36 +02:00
|
|
|
vreport(REPORT_TYPE_ERROR, fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Print a warning message to current monitor if we have one, else to stderr.
|
|
|
|
* Format arguments like sprintf(). The resulting message should be a
|
|
|
|
* single phrase, with no newline or trailing punctuation.
|
|
|
|
* Prepend the current location and append a newline.
|
|
|
|
*/
|
|
|
|
void warn_report(const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
vreport(REPORT_TYPE_WARNING, fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Print an information message to current monitor if we have one, else to
|
|
|
|
* stderr.
|
|
|
|
* Format arguments like sprintf(). The resulting message should be a
|
|
|
|
* single phrase, with no newline or trailing punctuation.
|
|
|
|
* Prepend the current location and append a newline.
|
|
|
|
*/
|
|
|
|
void info_report(const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
vreport(REPORT_TYPE_INFO, fmt, ap);
|
2014-10-08 14:11:54 +02:00
|
|
|
va_end(ap);
|
|
|
|
}
|
2018-08-30 16:59:01 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Like error_report(), except print just once.
|
|
|
|
* If *printed is false, print the message, and flip *printed to true.
|
|
|
|
* Return whether the message was printed.
|
|
|
|
*/
|
|
|
|
bool error_report_once_cond(bool *printed, const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
assert(printed);
|
|
|
|
if (*printed) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
*printed = true;
|
|
|
|
va_start(ap, fmt);
|
|
|
|
vreport(REPORT_TYPE_ERROR, fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Like warn_report(), except print just once.
|
|
|
|
* If *printed is false, print the message, and flip *printed to true.
|
|
|
|
* Return whether the message was printed.
|
|
|
|
*/
|
|
|
|
bool warn_report_once_cond(bool *printed, const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
assert(printed);
|
|
|
|
if (*printed) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
*printed = true;
|
|
|
|
va_start(ap, fmt);
|
|
|
|
vreport(REPORT_TYPE_WARNING, fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
return true;
|
|
|
|
}
|
log: Make glib logging go through QEMU
This commit adds a error_init() helper which calls
g_log_set_default_handler() so that glib logs (g_log, g_warning, ...)
are handled similarly to other QEMU logs. This means they will get a
timestamp if timestamps are enabled, and they will go through the
HMP monitor if one is configured.
This commit also adds a call to error_init() to the binaries
installed by QEMU. Since error_init() also calls error_set_progname(),
this means that *-linux-user, *-bsd-user and qemu-pr-helper messages
output with error_report, info_report, ... will slightly change: they
will be prefixed by the binary name.
glib debug messages are enabled through G_MESSAGES_DEBUG similarly to
the glib default log handler.
At the moment, this change will mostly impact SPICE logging if your
spice version is >= 0.14.1. With older spice versions, this is not going
to work as expected, but will not have any ill effect, so this call is
not conditional on the SPICE version.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20190131164614.19209-3-cfergeau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2019-01-31 17:46:14 +01:00
|
|
|
|
|
|
|
static char *qemu_glog_domains;
|
|
|
|
|
|
|
|
static void qemu_log_func(const gchar *log_domain,
|
|
|
|
GLogLevelFlags log_level,
|
|
|
|
const gchar *message,
|
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
switch (log_level & G_LOG_LEVEL_MASK) {
|
|
|
|
case G_LOG_LEVEL_DEBUG:
|
|
|
|
case G_LOG_LEVEL_INFO:
|
|
|
|
/*
|
|
|
|
* Use same G_MESSAGES_DEBUG logic as glib to enable/disable debug
|
|
|
|
* messages
|
|
|
|
*/
|
|
|
|
if (qemu_glog_domains == NULL) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (strcmp(qemu_glog_domains, "all") != 0 &&
|
|
|
|
(log_domain == NULL || !strstr(qemu_glog_domains, log_domain))) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* Fall through */
|
|
|
|
case G_LOG_LEVEL_MESSAGE:
|
|
|
|
info_report("%s%s%s",
|
|
|
|
log_domain ?: "", log_domain ? ": " : "", message);
|
|
|
|
|
|
|
|
break;
|
|
|
|
case G_LOG_LEVEL_WARNING:
|
|
|
|
warn_report("%s%s%s",
|
|
|
|
log_domain ?: "", log_domain ? ": " : "", message);
|
|
|
|
break;
|
|
|
|
case G_LOG_LEVEL_CRITICAL:
|
|
|
|
case G_LOG_LEVEL_ERROR:
|
|
|
|
error_report("%s%s%s",
|
|
|
|
log_domain ?: "", log_domain ? ": " : "", message);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void error_init(const char *argv0)
|
|
|
|
{
|
2022-02-21 11:11:47 +01:00
|
|
|
const char *p = strrchr(argv0, '/');
|
|
|
|
|
log: Make glib logging go through QEMU
This commit adds a error_init() helper which calls
g_log_set_default_handler() so that glib logs (g_log, g_warning, ...)
are handled similarly to other QEMU logs. This means they will get a
timestamp if timestamps are enabled, and they will go through the
HMP monitor if one is configured.
This commit also adds a call to error_init() to the binaries
installed by QEMU. Since error_init() also calls error_set_progname(),
this means that *-linux-user, *-bsd-user and qemu-pr-helper messages
output with error_report, info_report, ... will slightly change: they
will be prefixed by the binary name.
glib debug messages are enabled through G_MESSAGES_DEBUG similarly to
the glib default log handler.
At the moment, this change will mostly impact SPICE logging if your
spice version is >= 0.14.1. With older spice versions, this is not going
to work as expected, but will not have any ill effect, so this call is
not conditional on the SPICE version.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20190131164614.19209-3-cfergeau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2019-01-31 17:46:14 +01:00
|
|
|
/* Set the program name for error_print_loc(). */
|
2022-02-21 11:11:47 +01:00
|
|
|
g_set_prgname(p ? p + 1 : argv0);
|
log: Make glib logging go through QEMU
This commit adds a error_init() helper which calls
g_log_set_default_handler() so that glib logs (g_log, g_warning, ...)
are handled similarly to other QEMU logs. This means they will get a
timestamp if timestamps are enabled, and they will go through the
HMP monitor if one is configured.
This commit also adds a call to error_init() to the binaries
installed by QEMU. Since error_init() also calls error_set_progname(),
this means that *-linux-user, *-bsd-user and qemu-pr-helper messages
output with error_report, info_report, ... will slightly change: they
will be prefixed by the binary name.
glib debug messages are enabled through G_MESSAGES_DEBUG similarly to
the glib default log handler.
At the moment, this change will mostly impact SPICE logging if your
spice version is >= 0.14.1. With older spice versions, this is not going
to work as expected, but will not have any ill effect, so this call is
not conditional on the SPICE version.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20190131164614.19209-3-cfergeau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2019-01-31 17:46:14 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This sets up glib logging so libraries using it also print their logs
|
|
|
|
* through error_report(), warn_report(), info_report().
|
|
|
|
*/
|
|
|
|
g_log_set_default_handler(qemu_log_func, NULL);
|
|
|
|
g_warn_if_fail(qemu_glog_domains == NULL);
|
|
|
|
qemu_glog_domains = g_strdup(g_getenv("G_MESSAGES_DEBUG"));
|
|
|
|
}
|