From 1ecda02b24a13f501e747b8442934829d82698ae Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 18 Feb 2010 17:25:24 +0100 Subject: error: Replace qemu_error() by error_report() 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. --- qemu-error.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'qemu-error.c') diff --git a/qemu-error.c b/qemu-error.c index d20fd0f4d2..51e2abf636 100644 --- a/qemu-error.c +++ b/qemu-error.c @@ -41,13 +41,19 @@ void error_printf(const char *fmt, ...) va_end(ap); } -void qemu_error(const char *fmt, ...) +/* + * 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, -- cgit v1.2.3-59-g8ed1b