diff options
| author | Stefan Weil <sw@weilnetz.de> | 2013-11-10 16:04:16 +0100 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2013-12-02 21:02:00 +0400 |
| commit | 5d28b0e960cd3a99f7e013900a0e12468720b402 (patch) | |
| tree | 9d5cee588c128f64be9af6bd224987cf669744ee | |
| parent | 12269616227c2ee34f4c853cae676e18a5e01b18 (diff) | |
| download | focaccia-qemu-5d28b0e960cd3a99f7e013900a0e12468720b402.tar.gz focaccia-qemu-5d28b0e960cd3a99f7e013900a0e12468720b402.zip | |
console: Replace conditional debug messages by trace methods
Signed-off-by: Stefan Weil <sw@weilnetz.de> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | trace-events | 2 | ||||
| -rw-r--r-- | ui/console.c | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/trace-events b/trace-events index 8695e9e5b7..d196234489 100644 --- a/trace-events +++ b/trace-events @@ -1010,6 +1010,8 @@ dma_map_wait(void *dbs) "dbs=%p" # ui/console.c console_gfx_new(void) "" +console_putchar_csi(int esc_param0, int esc_param1, int ch, int nb_esc_params) "escape sequence CSI%d;%d%c, %d parameters" +console_putchar_unhandled(int ch) "unhandled escape character '%c'" console_txt_new(int w, int h) "%dx%d" console_select(int nr) "%d" console_refresh(int interval) "interval %d ms" diff --git a/ui/console.c b/ui/console.c index 61ed2190a3..586fc6d6f1 100644 --- a/ui/console.c +++ b/ui/console.c @@ -29,7 +29,6 @@ #include "sysemu/char.h" #include "trace.h" -//#define DEBUG_CONSOLE #define DEFAULT_BACKSCROLL 512 #define MAX_CONSOLES 12 #define CONSOLE_CURSOR_PERIOD 500 @@ -867,10 +866,8 @@ static void console_putchar(QemuConsole *s, int ch) s->nb_esc_params++; if (ch == ';') break; -#ifdef DEBUG_CONSOLE - fprintf(stderr, "escape sequence CSI%d;%d%c, %d parameters\n", - s->esc_params[0], s->esc_params[1], ch, s->nb_esc_params); -#endif + trace_console_putchar_csi(s->esc_params[0], s->esc_params[1], + ch, s->nb_esc_params); s->state = TTY_STATE_NORM; switch(ch) { case 'A': @@ -984,9 +981,7 @@ static void console_putchar(QemuConsole *s, int ch) s->y = s->y_saved; break; default: -#ifdef DEBUG_CONSOLE - fprintf(stderr, "unhandled escape character '%c'\n", ch); -#endif + trace_console_putchar_unhandled(ch); break; } break; |