From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US2Me-0001WG-2U for qemu-devel@nongnu.org; Tue, 16 Apr 2013 05:39:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1US2MY-0006uG-N8 for qemu-devel@nongnu.org; Tue, 16 Apr 2013 05:39:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59658) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US2MY-0006tm-FJ for qemu-devel@nongnu.org; Tue, 16 Apr 2013 05:39:42 -0400 From: Gerd Hoffmann Date: Tue, 16 Apr 2013 11:39:24 +0200 Message-Id: <1366105178-26744-11-git-send-email-kraxel@redhat.com> In-Reply-To: <1366105178-26744-1-git-send-email-kraxel@redhat.com> References: <1366105178-26744-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 10/24] console: add trace events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- trace-events | 3 +++ ui/console.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/trace-events b/trace-events index b4d69d6..b08627b 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 1935996..3834e39 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 { -- 1.7.9.7