Signed-off-by: Alon Levy <al...@redhat.com>
---
hw/qxl-render.c | 13 ++++---------
trace-events | 6 ++++++
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/hw/qxl-render.c b/hw/qxl-render.c
index 25857f6..74e7ea3 100644
--- a/hw/qxl-render.c
+++ b/hw/qxl-render.c
@@ -31,11 +31,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_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_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 +106,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_guest_primary_resized(
qxl->guest_primary.surface.width,
qxl->guest_primary.surface.height,
qxl->guest_primary.qxl_stride,
@@ -118,8 +116,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 +123,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 +181,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 699b618..b352538 100644
--- a/trace-events
+++ b/trace-events
@@ -750,3 +750,9 @@ 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, uint32_t num_dirty_rects, uint32_t
clear_dirty_region) "%d sid=%d [%d,%d,%d,%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_blit_guest_primary_initialized(void) ""
+qxl_blit(int32_t stride, int32_t left, int32_t right, int32_t top, int32_t
bottom) "stride=%d [%d, %d, %d, %d]"
+qxl_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.9.3
