[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 05/16] hw/isa/apm: Convert debug printf()s to trace events
From: |
Laurent Vivier |
Subject: |
[PULL v2 05/16] hw/isa/apm: Convert debug printf()s to trace events |
Date: |
Wed, 10 Jun 2020 15:10:00 +0200 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Convert APM_DPRINTF() to trace events and remove ifdef'ry.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200524164806.12658-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/isa/apm.c | 15 +++++----------
hw/isa/trace-events | 4 ++++
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/hw/isa/apm.c b/hw/isa/apm.c
index 6300b1ba7ace..bce266b9574c 100644
--- a/hw/isa/apm.c
+++ b/hw/isa/apm.c
@@ -24,14 +24,8 @@
#include "hw/isa/apm.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
+#include "trace.h"
-//#define DEBUG
-
-#ifdef DEBUG
-# define APM_DPRINTF(format, ...) printf(format, ## __VA_ARGS__)
-#else
-# define APM_DPRINTF(format, ...) do { } while (0)
-#endif
/* fixed I/O location */
#define APM_STS_IOPORT 0xb3
@@ -41,8 +35,8 @@ static void apm_ioport_writeb(void *opaque, hwaddr addr,
uint64_t val,
{
APMState *apm = opaque;
addr &= 1;
- APM_DPRINTF("apm_ioport_writeb addr=0x%" HWADDR_PRIx
- " val=0x%02" PRIx64 "\n", addr, val);
+
+ trace_apm_io_write(addr, val);
if (addr == 0) {
apm->apmc = val;
@@ -65,7 +59,8 @@ static uint64_t apm_ioport_readb(void *opaque, hwaddr addr,
unsigned size)
} else {
val = apm->apms;
}
- APM_DPRINTF("apm_ioport_readb addr=0x%" HWADDR_PRIx " val=0x%02x\n", addr,
val);
+ trace_apm_io_read(addr, val);
+
return val;
}
diff --git a/hw/isa/trace-events b/hw/isa/trace-events
index 202f8938e7b8..3544c6213c39 100644
--- a/hw/isa/trace-events
+++ b/hw/isa/trace-events
@@ -9,3 +9,7 @@ superio_create_ide(int id, uint16_t base, unsigned int irq)
"id=%d, base 0x%03x,
# pc87312.c
pc87312_io_read(uint32_t addr, uint32_t val) "read addr=0x%x val=0x%x"
pc87312_io_write(uint32_t addr, uint32_t val) "write addr=0x%x val=0x%x"
+
+# apm.c
+apm_io_read(uint8_t addr, uint8_t val) "read addr=0x%x val=0x%02x"
+apm_io_write(uint8_t addr, uint8_t val) "write addr=0x%x val=0x%02x"
--
2.26.2
- [PULL v2 00/16] Trivial branch for 5.1 patches, Laurent Vivier, 2020/06/10
- [PULL v2 03/16] .mailmap: Update Fred Konrad email address, Laurent Vivier, 2020/06/10
- [PULL v2 05/16] hw/isa/apm: Convert debug printf()s to trace events,
Laurent Vivier <=
- [PULL v2 02/16] net: Do not include a newline in the id of -nic devices, Laurent Vivier, 2020/06/10
- [PULL v2 08/16] hw/arm/aspeed: Correct DRAM container region size, Laurent Vivier, 2020/06/10
- [PULL v2 01/16] Fix parameter type in vhost migration log path, Laurent Vivier, 2020/06/10
- [PULL v2 07/16] qemu-img: Fix doc typo for 'bitmap' subcommand, Laurent Vivier, 2020/06/10
- [PULL v2 06/16] hw/misc/auxbus: Use qemu_log_mask(UNIMP) instead of debug printf, Laurent Vivier, 2020/06/10
- [PULL v2 09/16] hw/hppa/dino: Use the IEC binary prefix definitions, Laurent Vivier, 2020/06/10
- [PULL v2 13/16] target/unicore32: Replace DPRINTF() by qemu_log_mask(GUEST_ERROR), Laurent Vivier, 2020/06/10
- [PULL v2 12/16] target/unicore32: Remove unused headers, Laurent Vivier, 2020/06/10
- [PULL v2 14/16] target/unicore32: Prefer qemu_semihosting_log_out() over curses, Laurent Vivier, 2020/06/10
- [PULL v2 11/16] target/i386/cpu: Use the IEC binary prefix definitions, Laurent Vivier, 2020/06/10