From ac86048bcd41129b18702ba63395f222871804de Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 10 Nov 2013 14:20:16 +0100 Subject: trace: Remove trace.h from console.h (less dependencies) This reduces the dependencies on trace.h. Only two source files which need console.h also need trace.h. Signed-off-by: Stefan Weil Signed-off-by: Michael Tokarev --- ui/console.c | 1 + 1 file changed, 1 insertion(+) (limited to 'ui/console.c') diff --git a/ui/console.c b/ui/console.c index 199ba69..61ed219 100644 --- a/ui/console.c +++ b/ui/console.c @@ -27,6 +27,7 @@ #include "qemu/timer.h" #include "qmp-commands.h" #include "sysemu/char.h" +#include "trace.h" //#define DEBUG_CONSOLE #define DEFAULT_BACKSCROLL 512 -- cgit v1.1 From 5d28b0e960cd3a99f7e013900a0e12468720b402 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 10 Nov 2013 16:04:16 +0100 Subject: console: Replace conditional debug messages by trace methods Signed-off-by: Stefan Weil Reviewed-by: Gerd Hoffmann Signed-off-by: Michael Tokarev --- ui/console.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'ui/console.c') diff --git a/ui/console.c b/ui/console.c index 61ed219..586fc6d 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; -- cgit v1.1 From 1246b259f846136d58a89568fdc0421d02e4df65 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 1 Dec 2013 08:49:47 +0100 Subject: misc: Replace 'struct QEMUTimer' by 'QEMUTimer' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Most code already used QEMUTimer without the redundant 'struct' keyword. Signed-off-by: Stefan Weil Reviewed-by: Andreas Färber Signed-off-by: Michael Tokarev --- ui/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/console.c') diff --git a/ui/console.c b/ui/console.c index 586fc6d..502e160 100644 --- a/ui/console.c +++ b/ui/console.c @@ -161,7 +161,7 @@ struct QemuConsole { }; struct DisplayState { - struct QEMUTimer *gui_timer; + QEMUTimer *gui_timer; uint64_t last_update; uint64_t update_interval; bool refreshing; -- cgit v1.1