mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-28 05:50:37 +00:00
1ecda02b24
error_report() terminates the message with a newline. Strip it it from its arguments. This fixes a few error messages lacking a newline: net_handle_fd_param()'s "No file descriptor named %s found", and tap_open()'s "vnet_hdr=1 requested, but no kernel support for IFF_VNET_HDR available" (all three versions). There's one place that passes arguments without newlines intentionally: load_vmstate(). Fix it up.
76 lines
1.6 KiB
C
76 lines
1.6 KiB
C
/*
|
|
* 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.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include "monitor.h"
|
|
#include "sysemu.h"
|
|
|
|
/*
|
|
* Print to current monitor if we have one, else to stderr.
|
|
* TODO should return int, so callers can calculate width, but that
|
|
* requires surgery to monitor_vprintf(). Left for another day.
|
|
*/
|
|
void error_vprintf(const char *fmt, va_list ap)
|
|
{
|
|
if (cur_mon) {
|
|
monitor_vprintf(cur_mon, fmt, ap);
|
|
} else {
|
|
vfprintf(stderr, fmt, ap);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Print to current monitor if we have one, else to stderr.
|
|
* TODO just like error_vprintf()
|
|
*/
|
|
void error_printf(const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
|
|
va_start(ap, fmt);
|
|
error_vprintf(fmt, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
/*
|
|
* Print an error message to current monitor if we have one, else to stderr.
|
|
* Appends a newline to the message.
|
|
* It's wrong to call this in a QMP monitor. Use qemu_error_new() there.
|
|
*/
|
|
void error_report(const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
|
|
va_start(ap, fmt);
|
|
error_vprintf(fmt, ap);
|
|
va_end(ap);
|
|
error_printf("\n");
|
|
}
|
|
|
|
void qemu_error_internal(const char *file, int linenr, const char *func,
|
|
const char *fmt, ...)
|
|
{
|
|
va_list va;
|
|
QError *qerror;
|
|
|
|
va_start(va, fmt);
|
|
qerror = qerror_from_info(file, linenr, func, fmt, &va);
|
|
va_end(va);
|
|
|
|
if (cur_mon) {
|
|
monitor_set_error(cur_mon, qerror);
|
|
} else {
|
|
qerror_print(qerror);
|
|
QDECREF(qerror);
|
|
}
|
|
}
|