[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/21] hw/display/cg3: Convert debug printf()s to trace events
From: |
Gerd Hoffmann |
Subject: |
[PULL 02/21] hw/display/cg3: Convert debug printf()s to trace events |
Date: |
Thu, 28 May 2020 14:35:50 +0200 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Convert DPRINTF() to trace events and remove ifdef'ry.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20200526062252.19852-3-f4bug@amsat.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/display/cg3.c | 14 ++++----------
hw/display/trace-events | 4 ++++
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/hw/display/cg3.c b/hw/display/cg3.c
index f7f1c199ce54..7cbe6e56ff69 100644
--- a/hw/display/cg3.c
+++ b/hw/display/cg3.c
@@ -35,6 +35,7 @@
#include "hw/qdev-properties.h"
#include "qemu/log.h"
#include "qemu/module.h"
+#include "trace.h"
/* Change to 1 to enable debugging */
#define DEBUG_CG3 0
@@ -63,12 +64,6 @@
#define CG3_VRAM_SIZE 0x100000
#define CG3_VRAM_OFFSET 0x800000
-#define DPRINTF(fmt, ...) do { \
- if (DEBUG_CG3) { \
- printf("CG3: " fmt , ## __VA_ARGS__); \
- } \
-} while (0)
-
#define TYPE_CG3 "cgthree"
#define CG3(obj) OBJECT_CHECK(CG3State, (obj), TYPE_CG3)
@@ -195,7 +190,8 @@ static uint64_t cg3_reg_read(void *opaque, hwaddr addr,
unsigned size)
val = 0;
break;
}
- DPRINTF("read %02x from reg %" HWADDR_PRIx "\n", val, addr);
+ trace_cg3_read(addr, val, size);
+
return val;
}
@@ -206,9 +202,7 @@ static void cg3_reg_write(void *opaque, hwaddr addr,
uint64_t val,
uint8_t regval;
int i;
- DPRINTF("write %" PRIx64 " to reg %" HWADDR_PRIx " size %d\n",
- val, addr, size);
-
+ trace_cg3_write(addr, val, size);
switch (addr) {
case CG3_REG_BT458_ADDR:
s->dac_index = val;
diff --git a/hw/display/trace-events b/hw/display/trace-events
index e6e22bef8899..47b2b168ae15 100644
--- a/hw/display/trace-events
+++ b/hw/display/trace-events
@@ -151,3 +151,7 @@ artist_vram_write(unsigned int size, uint64_t addr,
uint64_t val) "%u 0x%"PRIx64
artist_fill_window(unsigned int start_x, unsigned int start_y, unsigned int
width, unsigned int height, uint32_t op, uint32_t ctlpln) "start=%ux%u
length=%ux%u op=0x%08x ctlpln=0x%08x"
artist_block_move(unsigned int start_x, unsigned int start_y, unsigned int
dest_x, unsigned int dest_y, unsigned int width, unsigned int height) "source
%ux%u -> dest %ux%u size %ux%u"
artist_draw_line(unsigned int start_x, unsigned int start_y, unsigned int
end_x, unsigned int end_y) "%ux%u %ux%u"
+
+# cg3.c
+cg3_read(uint32_t addr, uint32_t val, unsigned size) "read addr:0x%06"PRIx32"
val:0x%08"PRIx32" size:%u"
+cg3_write(uint32_t addr, uint32_t val, unsigned size) "write
addr:0x%06"PRIx32" val:0x%08"PRIx32" size:%u"
--
2.18.4
- [PULL 00/21] Vga 20200528 patches, Gerd Hoffmann, 2020/05/28
- [PULL 03/21] hw/display/cirrus_vga: Convert debug printf() to trace event, Gerd Hoffmann, 2020/05/28
- [PULL 04/21] hw/display/cirrus_vga: Use qemu_log_mask(UNIMP) instead of debug printf, Gerd Hoffmann, 2020/05/28
- [PULL 08/21] hw/display/dpcd: Convert debug printf()s to trace events, Gerd Hoffmann, 2020/05/28
- [PULL 19/21] sm501: Replace hand written implementation with pixman where possible, Gerd Hoffmann, 2020/05/28
- [PULL 02/21] hw/display/cg3: Convert debug printf()s to trace events,
Gerd Hoffmann <=
- [PULL 13/21] hw/display/omap_dss: Replace fprintf() call by qemu_log_mask(LOG_UNIMP), Gerd Hoffmann, 2020/05/28
- [PULL 15/21] sm501: Convert printf + abort to qemu_log_mask, Gerd Hoffmann, 2020/05/28
- [PULL 06/21] hw/display/cirrus_vga: Convert debug printf() to trace event, Gerd Hoffmann, 2020/05/28
- [PULL 16/21] sm501: Shorten long variable names in sm501_2d_operation, Gerd Hoffmann, 2020/05/28
- [PULL 21/21] sm501: Remove obsolete changelog and todo comment, Gerd Hoffmann, 2020/05/28
- [PULL 10/21] hw/display/vmware_vga: Replace printf() calls by qemu_log_mask(ERROR), Gerd Hoffmann, 2020/05/28
- [PULL 20/21] sm501: Optimize small overlapping blits, Gerd Hoffmann, 2020/05/28
- [PULL 17/21] sm501: Use BIT(x) macro to shorten constant, Gerd Hoffmann, 2020/05/28
- [PULL 12/21] hw/display/exynos4210_fimd: Use qemu_log_mask(GUEST_ERROR), Gerd Hoffmann, 2020/05/28
- [PULL 11/21] hw/display/vmware_vga: Let the PCI device own its I/O MemoryRegion, Gerd Hoffmann, 2020/05/28