[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 03/14] console: Replace conditional debug messages
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 03/14] console: Replace conditional debug messages by trace methods |
Date: |
Fri, 6 Dec 2013 23:15:30 +0400 |
From: Stefan Weil <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
trace-events | 2 ++
ui/console.c | 11 +++--------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/trace-events b/trace-events
index 8695e9e..d196234 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 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;
--
1.7.10.4
- [Qemu-trivial] [PULL 00/14] Trivial patches for 2013-12-06, Michael Tokarev, 2013/12/06
- [Qemu-trivial] [PULL 02/14] trace: Remove trace.h from hw/usb/hcd-ehci.h (less dependencies), Michael Tokarev, 2013/12/06
- [Qemu-trivial] [PULL 05/14] .gitignore: Ignore config.status, Michael Tokarev, 2013/12/06
- [Qemu-trivial] [PULL 03/14] console: Replace conditional debug messages by trace methods,
Michael Tokarev <=
- [Qemu-trivial] [PULL 01/14] trace: Remove trace.h from console.h (less dependencies), Michael Tokarev, 2013/12/06
- [Qemu-trivial] [PULL 04/14] gtk: Replace conditional debug messages by trace methods, Michael Tokarev, 2013/12/06
- [Qemu-trivial] [PULL 12/14] Don't crash on keyboard input with no handler, Michael Tokarev, 2013/12/06
- [Qemu-trivial] [PULL 10/14] libcacard/cac: Remove unused statement (value stored is never read), Michael Tokarev, 2013/12/06
- [Qemu-trivial] [PULL 11/14] libcacard/vcard_emul_nss: Remove unused statement (value stored is never read), Michael Tokarev, 2013/12/06
- [Qemu-trivial] [PULL 08/14] misc: Replace 'struct QEMUTimer' by 'QEMUTimer', Michael Tokarev, 2013/12/06
- [Qemu-trivial] [PULL 14/14] eeprom93xx: fix coding style, Michael Tokarev, 2013/12/06
- [Qemu-trivial] [PULL 07/14] qobject: Fix compiler warning (missing gnu_printf format attribute), Michael Tokarev, 2013/12/06
- [Qemu-trivial] [PULL 13/14] hw/ppc/mac.h: remove unused BIOS_FILENAME definition, Michael Tokarev, 2013/12/06
- [Qemu-trivial] [PULL 09/14] virtio-net: fix the indent, Michael Tokarev, 2013/12/06