Commit 5748e4c2 authored by Corey Minyard's avatar Corey Minyard Committed by Paolo Bonzini
Browse files

qemu-error: Add error_vreport() 



Needed to nicely print socket error reports.

Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 35e4e96c

include/qemu/error-report.h

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ void error_vprintf(const char *fmt, va_list ap) GCC_FMT_ATTR(1, 0); 
void error_printf(const char *fmt, ...) GCC_FMT_ATTR(1, 2);

void error_printf_unless_qmp(const char *fmt, ...) GCC_FMT_ATTR(1, 2);

void error_set_progname(const char *argv0);

void error_vreport(const char *fmt, va_list ap) GCC_FMT_ATTR(1, 0);

void error_report(const char *fmt, ...) GCC_FMT_ATTR(1, 2);

const char *error_get_progname(void);

extern bool enable_timestamp_msg;

util/qemu-error.c

+18 −5
Original line number Diff line number Diff line
@@ -199,14 +199,13 @@ static void error_print_loc(void) 
bool enable_timestamp_msg;

/*

 * Print an error message to current monitor if we have one, else to stderr.

 * Format arguments like sprintf().  The result should not contain

 * Format arguments like vsprintf().  The result should not contain

 * newlines.

 * Prepend the current location and append a newline.

 * It's wrong to call this in a QMP monitor.  Use qerror_report() there.

 */

void error_report(const char *fmt, ...)

void error_vreport(const char *fmt, va_list ap)

{

    va_list ap;

    GTimeVal tv;

    gchar *timestr;
@@ -218,8 +217,22 @@ void error_report(const char *fmt, ...) 
    }



    error_print_loc();

    va_start(ap, fmt);

    error_vprintf(fmt, ap);

    va_end(ap);

    error_printf("\n");

}



/*

 * Print an error message to current monitor if we have one, else to stderr.

 * Format arguments like sprintf().  The result should not contain

 * newlines.

 * Prepend the current location and append a newline.

 * It's wrong to call this in a QMP monitor.  Use qerror_report() there.

 */

void error_report(const char *fmt, ...)

{

    va_list ap;



    va_start(ap, fmt);

    error_vreport(fmt, ap);

    va_end(ap);

}