From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-trivial@nongnu.org, qemu-devel@nongnu.org
Cc: "Hervé Poussineau" <hpoussin@reactos.org>,
qemu-ppc@nongnu.org, "Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PATCH 2/2] hw/timer/m48t59: Convert debug printf()s to trace events
Date: Wed, 26 Jun 2019 14:20:42 +0200 [thread overview]
Message-ID: <20190626122042.7656-3-philmd@redhat.com> (raw)
In-Reply-To: <20190626122042.7656-1-philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/timer/m48t59-internal.h | 5 -----
hw/timer/m48t59.c | 11 +++++------
hw/timer/trace-events | 6 ++++++
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/timer/m48t59-internal.h b/hw/timer/m48t59-internal.h
index 4d4f2a6fed..cd648241e9 100644
--- a/hw/timer/m48t59-internal.h
+++ b/hw/timer/m48t59-internal.h
@@ -26,11 +26,6 @@
#ifndef HW_M48T59_INTERNAL_H
#define HW_M48T59_INTERNAL_H
-#define M48T59_DEBUG 0
-
-#define NVRAM_PRINTF(fmt, ...) do { \
- if (M48T59_DEBUG) { printf(fmt , ## __VA_ARGS__); } } while (0)
-
/*
* The M48T02, M48T08 and M48T59 chips are very similar. The newer '59 has
* alarm and a watchdog timer and related control registers. In the
diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c
index 030c8872a2..d50b4ddea2 100644
--- a/hw/timer/m48t59.c
+++ b/hw/timer/m48t59.c
@@ -33,6 +33,7 @@
#include "exec/address-spaces.h"
#include "qemu/bcd.h"
#include "qemu/module.h"
+#include "trace.h"
#include "m48t59-internal.h"
@@ -189,8 +190,7 @@ void m48t59_write(M48t59State *NVRAM, uint32_t addr, uint32_t val)
struct tm tm;
int tmp;
- if (addr > 0x1FF8 && addr < 0x2000)
- NVRAM_PRINTF("%s: 0x%08x => 0x%08x\n", __func__, addr, val);
+ trace_m48txx_nvram_mem_write(addr, val);
/* check for NVRAM access */
if ((NVRAM->model == 2 && addr < 0x7f8) ||
@@ -447,8 +447,7 @@ uint32_t m48t59_read(M48t59State *NVRAM, uint32_t addr)
}
break;
}
- if (addr > 0x1FF9 && addr < 0x2000)
- NVRAM_PRINTF("%s: 0x%08x <= 0x%08x\n", __func__, addr, retval);
+ trace_m48txx_nvram_mem_read(addr, retval);
return retval;
}
@@ -459,7 +458,7 @@ static void NVRAM_writeb(void *opaque, hwaddr addr, uint64_t val,
{
M48t59State *NVRAM = opaque;
- NVRAM_PRINTF("%s: 0x%"HWADDR_PRIx" => 0x%"PRIx64"\n", __func__, addr, val);
+ trace_m48txx_nvram_io_write(addr, val);
switch (addr) {
case 0:
NVRAM->addr &= ~0x00FF;
@@ -491,7 +490,7 @@ static uint64_t NVRAM_readb(void *opaque, hwaddr addr, unsigned size)
retval = -1;
break;
}
- NVRAM_PRINTF("%s: 0x%"HWADDR_PRIx" <= 0x%08x\n", __func__, addr, retval);
+ trace_m48txx_nvram_io_read(addr, retval);
return retval;
}
diff --git a/hw/timer/trace-events b/hw/timer/trace-events
index dcaf3d6da6..66ccdd0974 100644
--- a/hw/timer/trace-events
+++ b/hw/timer/trace-events
@@ -83,3 +83,9 @@ pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
pl031_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
pl031_alarm_raised(void) "alarm raised"
pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks"
+
+# m48t59.c
+m48txx_nvram_io_read(uint64_t addr, uint64_t value) "io read addr:0x%04" PRIx64 " value:0x%02" PRIx64
+m48txx_nvram_io_write(uint64_t addr, uint64_t value) "io write addr:0x%04" PRIx64 " value:0x%02" PRIx64
+m48txx_nvram_mem_read(uint32_t addr, uint32_t value) "mem read addr:0x%04x value:0x%02x"
+m48txx_nvram_mem_write(uint32_t addr, uint32_t value) "mem write addr:0x%04x value:0x%02x"
--
2.20.1
next prev parent reply other threads:[~2019-06-26 12:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-26 12:20 [Qemu-devel] [PATCH 0/2] hw/timer/m48t59: Convert to trace events Philippe Mathieu-Daudé
2019-06-26 12:20 ` [Qemu-devel] [PATCH 1/2] MAINTAINERS: Add missing m48t59 files to the PReP section Philippe Mathieu-Daudé
2019-06-26 12:20 ` Philippe Mathieu-Daudé [this message]
2019-07-04 10:33 ` [Qemu-devel] [PATCH 0/2] hw/timer/m48t59: Convert to trace events Philippe Mathieu-Daudé
2019-11-21 15:28 ` Markus Armbruster
2019-11-21 16:21 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190626122042.7656-3-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=hpoussin@reactos.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).