Commit 397d30e9 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

qemu-error: remove dependency of stubs on monitor 



Leave the implementation of error_vprintf and error_vprintf_unless_qmp
(the latter now trivially wrapped by error_printf_unless_qmp) to
libqemustub.a and monitor.c.  This has two advantages: it lets us
remove the monitor_printf and monitor_vprintf stubs, and it lets
tests provide a different implementation of the functions that uses
g_test_message.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <1477326663-67817-2-git-send-email-pbonzini@redhat.com>
parent 9bc9732f

include/qemu/error-report.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ void loc_set_file(const char *fname, int lno); 


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_vprintf_unless_qmp(const char *fmt, va_list ap) GCC_FMT_ATTR(1, 0);

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);

monitor.c

+21 −0
Original line number Diff line number Diff line
@@ -3955,6 +3955,27 @@ static void monitor_readline_flush(void *opaque) 
    monitor_flush(opaque);

}



/*

 * 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_cur_is_qmp()) {

        monitor_vprintf(cur_mon, fmt, ap);

    } else {

        vfprintf(stderr, fmt, ap);

    }

}



void error_vprintf_unless_qmp(const char *fmt, va_list ap)

{

    if (cur_mon && !monitor_cur_is_qmp()) {

        monitor_vprintf(cur_mon, fmt, ap);

    }

}



static void __attribute__((constructor)) monitor_lock_init(void)

{

    qemu_mutex_init(&monitor_lock);

stubs/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ stub-obj-y += clock-warp.o 
stub-obj-y += cpu-get-clock.o

stub-obj-y += cpu-get-icount.o

stub-obj-y += dump.o

stub-obj-y += error-printf.o

stub-obj-y += fdset-add-fd.o

stub-obj-y += fdset-find-fd.o

stub-obj-y += fdset-get-fd.o
@@ -23,7 +24,6 @@ stub-obj-y += is-daemonized.o 
stub-obj-y += machine-init-done.o

stub-obj-y += migr-blocker.o

stub-obj-y += mon-is-qmp.o

stub-obj-y += mon-printf.o

stub-obj-y += monitor-init.o

stub-obj-y += notify-event.o

stub-obj-y += qtest.o

stubs/error-printf.c

0 → 100644
+13 −0
Original line number Diff line number Diff line 
#include "qemu/osdep.h"

#include "qemu-common.h"

#include "qemu/error-report.h"



void error_vprintf(const char *fmt, va_list ap)

{

    vfprintf(stderr, fmt, ap);

}



void error_vprintf_unless_qmp(const char *fmt, va_list ap)

{

    error_vprintf(fmt, ap);

}

stubs/mon-printf.c

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
#include "qemu/osdep.h"

#include "qemu-common.h"

#include "monitor/monitor.h"



void monitor_printf(Monitor *mon, const char *fmt, ...)

{

}



void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)

{

}