1 From e4a803d8ebd69719f4d997052e5bc3a5a7d91124 Mon Sep 17 00:00:00 2001
2 From: Alon Levy <alevy@redhat.com>
3 Date: Wed, 12 Sep 2012 16:13:26 +0300
4 Subject: [PATCH] hw/qxl: tracing fixes
6 Add two new trace events:
7 qxl_send_events(int qid, uint32_t events) "%d %d"
8 qxl_set_guest_bug(int qid) "%d"
10 Change qxl_io_unexpected_vga_mode parameters to be equivalent to those
11 of qxl_io_write for easier grouping under a single systemtap probe.
13 Change d to qxl in one place.
15 Signed-off-by: Alon Levy <alevy@redhat.com>
16 Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
17 (cherry picked from commit 917ae08ca1565aab2d10c8b6269cd905d6c5c05b)
19 Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
22 trace-events | 6 ++++--
23 2 files changed, 9 insertions(+), 5 deletions(-)
25 diff --git a/hw/qxl.c b/hw/qxl.c
26 index 67f7100..59bf822 100644
29 @@ -141,6 +141,7 @@ static void qxl_ring_set_dirty(PCIQXLDevice *qxl);
31 void qxl_set_guest_bug(PCIQXLDevice *qxl, const char *msg, ...)
33 + trace_qxl_set_guest_bug(qxl->id);
34 qxl_send_events(qxl, QXL_INTERRUPT_ERROR);
36 if (qxl->guestdebug) {
37 @@ -1381,7 +1382,7 @@ static void ioport_write(void *opaque, target_phys_addr_t addr,
40 trace_qxl_io_unexpected_vga_mode(d->id,
41 - io_port, io_port_to_string(io_port));
42 + addr, val, io_port_to_string(io_port));
43 /* be nice to buggy guest drivers */
44 if (io_port >= QXL_IO_UPDATE_AREA_ASYNC &&
45 io_port < QXL_IO_RANGE_SIZE) {
46 @@ -1580,9 +1581,9 @@ cancel_async:
47 static uint64_t ioport_read(void *opaque, target_phys_addr_t addr,
50 - PCIQXLDevice *d = opaque;
51 + PCIQXLDevice *qxl = opaque;
53 - trace_qxl_io_read_unexpected(d->id);
54 + trace_qxl_io_read_unexpected(qxl->id);
58 @@ -1612,6 +1613,7 @@ static void qxl_send_events(PCIQXLDevice *d, uint32_t events)
60 uint32_t le_events = cpu_to_le32(events);
62 + trace_qxl_send_events(d->id, events);
63 assert(qemu_spice_display_is_running(&d->ssd));
64 old_pending = __sync_fetch_and_or(&d->ram->int_pending, le_events);
65 if ((old_pending & le_events) == le_events) {
66 diff --git a/trace-events b/trace-events
67 index cf05414..aa79836 100644
70 @@ -931,7 +931,7 @@ qxl_interface_update_area_complete_overflow(int qid, int max) "%d max=%d"
71 qxl_interface_update_area_complete_schedule_bh(int qid, uint32_t num_dirty) "%d #dirty=%d"
72 qxl_io_destroy_primary_ignored(int qid, const char *mode) "%d %s"
73 qxl_io_read_unexpected(int qid) "%d"
74 -qxl_io_unexpected_vga_mode(int qid, uint32_t io_port, const char *desc) "%d 0x%x (%s)"
75 +qxl_io_unexpected_vga_mode(int qid, uint64_t addr, uint64_t val, const char *desc) "%d 0x%"PRIx64"=%"PRIu64" (%s)"
76 qxl_io_write(int qid, const char *mode, uint64_t addr, uint64_t val, unsigned size, int async) "%d %s addr=%"PRIu64 " val=%"PRIu64" size=%u async=%d"
77 qxl_memslot_add_guest(int qid, uint32_t slot_id, uint64_t guest_start, uint64_t guest_end) "%d %u: guest phys 0x%"PRIx64 " - 0x%" PRIx64
78 qxl_post_load(int qid, const char *mode) "%d %s"
79 @@ -962,7 +962,7 @@ qxl_spice_destroy_surfaces(int qid, int async) "%d async=%d"
80 qxl_spice_destroy_surface_wait_complete(int qid, uint32_t id) "%d sid=%d"
81 qxl_spice_destroy_surface_wait(int qid, uint32_t id, int async) "%d sid=%d async=%d"
82 qxl_spice_flush_surfaces_async(int qid, uint32_t surface_count, uint32_t num_free_res) "%d s#=%d, res#=%d"
83 -qxl_spice_monitors_config(int id) "%d"
84 +qxl_spice_monitors_config(int qid) "%d"
85 qxl_spice_loadvm_commands(int qid, void *ext, uint32_t count) "%d ext=%p count=%d"
86 qxl_spice_oom(int qid) "%d"
87 qxl_spice_reset_cursor(int qid) "%d"
88 @@ -971,6 +971,8 @@ qxl_spice_reset_memslots(int qid) "%d"
89 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]"
90 qxl_spice_update_area_rest(int qid, uint32_t num_dirty_rects, uint32_t clear_dirty_region) "%d #d=%d clear=%d"
91 qxl_surfaces_dirty(int qid, int surface, int offset, int size) "%d surface=%d offset=%d size=%d"
92 +qxl_send_events(int qid, uint32_t events) "%d %d"
93 +qxl_set_guest_bug(int qid) "%d"
96 qxl_render_blit_guest_primary_initialized(void) ""