aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2013-03-07 16:04:52 +0100
committerGerd Hoffmann <kraxel@redhat.com>2013-04-16 09:03:47 +0200
commit437fe1061be3da49b0b05ed2f0c9c50e2255c3fe (patch)
tree4e27b5cf23f61d3b0dbee56297a1bad781806a8b
parente27bd65a72dece59e93914d3ffa8653ce0c70511 (diff)
console: add trace events
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--trace-events3
-rw-r--r--ui/console.c4
2 files changed, 7 insertions, 0 deletions
diff --git a/trace-events b/trace-events
index b4d69d657c..b08627b192 100644
--- a/trace-events
+++ b/trace-events
@@ -962,6 +962,9 @@ dma_bdrv_cb(void *dbs, int ret) "dbs=%p ret=%d"
dma_map_wait(void *dbs) "dbs=%p"
# console.h
+console_gfx_new(void) ""
+console_txt_new(int w, int h) "%dx%d"
+console_select(int nr) "%d"
displaysurface_create(void *display_surface, int w, int h) "surface=%p, %dx%d"
displaysurface_create_from(void *display_surface, int w, int h, int bpp, int swap) "surface=%p, %dx%d, bpp %d, bswap %d"
displaysurface_free(void *display_surface) "surface=%p"
diff --git a/ui/console.c b/ui/console.c
index 1935996c26..3834e39f34 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -904,6 +904,8 @@ void console_select(unsigned int index)
if (index >= MAX_CONSOLES)
return;
+
+ trace_console_select(index);
if (active_console) {
surface = qemu_console_surface(active_console);
active_console->g_width = surface_width(surface);
@@ -1367,6 +1369,7 @@ QemuConsole *graphic_console_init(vga_hw_update_ptr update,
DisplayState *ds;
ds = (DisplayState *) g_malloc0(sizeof(DisplayState));
+ trace_console_gfx_new();
s = new_console(ds, GRAPHIC_CONSOLE);
s->hw_update = update;
s->hw_invalidate = invalidate;
@@ -1485,6 +1488,7 @@ static CharDriverState *text_console_init(ChardevVC *vc)
height = vc->rows * FONT_HEIGHT;
}
+ trace_console_txt_new(width, height);
if (width == 0 || height == 0) {
s = new_console(NULL, TEXT_CONSOLE);
} else {