From 6b3e0d7afd011b8d40207fe45f6518937df1d99e Mon Sep 17 00:00:00 2001

From: Alon Levy <alevy@redhat.com>

Date: Sun, 18 Mar 2012 13:46:15 +0100

Subject: [PATCH 426/434] qxl/qxl_render.c: add trace events

Signed-off-by: Alon Levy <alevy@redhat.com>

Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Cherry-pick: Added missing include "trace.h"

---

 hw/qxl-render.c |   14 +++++---------

 trace-events    |    7 +++++++

 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/hw/qxl-render.c b/hw/qxl-render.c

index 2e10e93..835dc5e 100644

--- a/hw/qxl-render.c

+++ b/hw/qxl-render.c

@@ -20,6 +20,7 @@

  */

 #include "qxl.h"

+#include "trace.h"

 static void qxl_blit(PCIQXLDevice *qxl, QXLRect *rect)

 {

@@ -31,11 +32,10 @@ static void qxl_blit(PCIQXLDevice *qxl, QXLRect *rect)

         return;

     }

     if (!qxl->guest_primary.data) {

-        dprint(qxl, 1, "%s: initializing guest_primary.data\n", __func__);

+        trace_qxl_render_blit_guest_primary_initialized();

         qxl->guest_primary.data = memory_region_get_ram_ptr(&qxl->vga.vram);

     }

-    dprint(qxl, 2, "%s: stride %d, [%d, %d, %d, %d]\n", __func__,

-            qxl->guest_primary.qxl_stride,

+    trace_qxl_render_blit(qxl->guest_primary.qxl_stride,

             rect->left, rect->right, rect->top, rect->bottom);

     src = qxl->guest_primary.data;

     if (qxl->guest_primary.qxl_stride < 0) {

@@ -107,8 +107,7 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl)

         qxl->guest_primary.data = memory_region_get_ram_ptr(&qxl->vga.vram);

         qxl_set_rect_to_surface(qxl, &qxl->dirty[0]);

         qxl->num_dirty_rects = 1;

-        dprint(qxl, 1, "%s: %dx%d, stride %d, bpp %d, depth %d\n",

-               __FUNCTION__,

+        trace_qxl_render_guest_primary_resized(

                qxl->guest_primary.surface.width,

                qxl->guest_primary.surface.height,

                qxl->guest_primary.qxl_stride,

@@ -118,8 +117,6 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl)

     if (surface->width != qxl->guest_primary.surface.width ||

         surface->height != qxl->guest_primary.surface.height) {

         if (qxl->guest_primary.qxl_stride > 0) {

-            dprint(qxl, 1, "%s: using guest_primary for displaysurface\n",

-                   __func__);

             qemu_free_displaysurface(vga->ds);

             qemu_create_displaysurface_from(qxl->guest_primary.surface.width,

                                             qxl->guest_primary.surface.height,

@@ -127,8 +124,6 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl)

                                             qxl->guest_primary.abs_stride,

                                             qxl->guest_primary.data);

         } else {

-            dprint(qxl, 1, "%s: resizing displaysurface to guest_primary\n",

-                   __func__);

             qemu_resize_displaysurface(vga->ds,

                     qxl->guest_primary.surface.width,

                     qxl->guest_primary.surface.height);

@@ -187,6 +182,7 @@ void qxl_render_update_area_bh(void *opaque)

 void qxl_render_update_area_done(PCIQXLDevice *qxl, QXLCookie *cookie)

 {

     qemu_mutex_lock(&qxl->ssd.lock);

+    trace_qxl_render_update_area_done(cookie);

     qemu_bh_schedule(qxl->update_area_bh);

     qxl->render_update_cookie_num--;

     qemu_mutex_unlock(&qxl->ssd.lock);

diff --git a/trace-events b/trace-events

index 0bc290f..6050d92 100644

--- a/trace-events

+++ b/trace-events

@@ -690,3 +690,10 @@ qxl_spice_reset_memslots(int qid) "%d"

 qxl_spice_update_area(int qid, uint32_t surface_id, uint32_t left, uint32_t right, uint32_t top, uint32_t bottom) "%d sid=%d [%d,%d,%d,%d]"

 qxl_spice_update_area_rest(int qid, uint32_t num_dirty_rects, uint32_t clear_dirty_region) "%d #d=%d clear=%d"

 qxl_surfaces_dirty(int qid, int surface, int offset, int size) "%d surface=%d offset=%d size=%d"

+qxl_vga_ioport_while_not_in_vga_mode(int qid) "%d (int qid, reset to VGA mode because of VGA io)"

+

+# hw/qxl-render.c

+qxl_render_blit_guest_primary_initialized(void) ""

+qxl_render_blit(int32_t stride, int32_t left, int32_t right, int32_t top, int32_t bottom) "stride=%d [%d, %d, %d, %d]"

+qxl_render_guest_primary_resized(int32_t width, int32_t height, int32_t stride, int32_t bytes_pp, int32_t bits_pp) "%dx%d, stride %d, bpp %d, depth %d"

+qxl_render_update_area_done(void *cookie) "%p"

-- 

1.7.10