[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/16] console: Replace conditional debug messages by
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 14/16] console: Replace conditional debug messages by trace methods |
Date: |
Wed, 13 Nov 2013 17:01:18 +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-devel] [PULL 04/16] qemu-char: add missing characters used in keymaps, (continued)
- [Qemu-devel] [PULL 04/16] qemu-char: add missing characters used in keymaps, Michael Tokarev, 2013/11/13
- [Qemu-devel] [PULL 07/16] qapi: Fix comment for create-type to match code., Michael Tokarev, 2013/11/13
- [Qemu-devel] [PULL 13/16] trace: Remove trace.h from hw/usb/hcd-ehci.h (less dependencies), Michael Tokarev, 2013/11/13
- [Qemu-devel] [PULL 11/16] console: Remove unused debug code, Michael Tokarev, 2013/11/13
- [Qemu-devel] [PULL 15/16] gtk: Replace conditional debug messages by trace methods, Michael Tokarev, 2013/11/13
- [Qemu-devel] [PULL 09/16] .travis.yml: basic compile and check recipes, Michael Tokarev, 2013/11/13
- [Qemu-devel] [PULL 06/16] vl: fix build when configured with no graphic support, Michael Tokarev, 2013/11/13
- [Qemu-devel] [PULL 05/16] usb: drop unused USBNetState.inpkt field, Michael Tokarev, 2013/11/13
- [Qemu-devel] [PULL 16/16] qga: Fix shutdown command of guest agent to work with SysV, Michael Tokarev, 2013/11/13
- [Qemu-devel] [PULL 12/16] trace: Remove trace.h from console.h (less dependencies), Michael Tokarev, 2013/11/13
- [Qemu-devel] [PULL 14/16] console: Replace conditional debug messages by trace methods,
Michael Tokarev <=
- [Qemu-devel] [PULL 08/16] pci-assign: Fix error_report of pci-stub message, Michael Tokarev, 2013/11/13
- Re: [Qemu-devel] [PULL 00/16] [for-1.7] Trivial patches for 2013-11-13, Stefan Weil, 2013/11/13