[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 07/23] hw/char/sh_serial: Add device id to trace output
From: |
BALATON Zoltan |
Subject: |
[PATCH v4 07/23] hw/char/sh_serial: Add device id to trace output |
Date: |
Thu, 28 Oct 2021 21:27:05 +0200 |
Normally there are at least two sh_serial instances. Add device id to
trace messages to make it clear which instance they belong to
otherwise its not possible to tell which serial device is accessed.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/char/sh_serial.c | 6 ++++--
hw/char/trace-events | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index 0af5d7a228..3f0a1cec7c 100644
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -94,9 +94,10 @@ static void sh_serial_write(void *opaque, hwaddr offs,
uint64_t val, unsigned size)
{
SHSerialState *s = opaque;
+ DeviceState *d = DEVICE(s);
unsigned char ch;
- trace_sh_serial_write(size, offs, val);
+ trace_sh_serial_write(d->id, size, offs, val);
switch (offs) {
case 0x00: /* SMR */
s->smr = val & ((s->feat & SH_SERIAL_FEAT_SCIF) ? 0x7b : 0xff);
@@ -211,6 +212,7 @@ static uint64_t sh_serial_read(void *opaque, hwaddr offs,
unsigned size)
{
SHSerialState *s = opaque;
+ DeviceState *d = DEVICE(s);
uint32_t ret = ~0;
#if 0
@@ -303,7 +305,7 @@ static uint64_t sh_serial_read(void *opaque, hwaddr offs,
break;
}
}
- trace_sh_serial_read(size, offs, ret);
+ trace_sh_serial_read(d->id, size, offs, ret);
if (ret & ~((1 << 16) - 1)) {
hw_error("sh_serial: unsupported read from 0x%02"HWADDR_PRIx"\n",
offs);
diff --git a/hw/char/trace-events b/hw/char/trace-events
index 4a92e7674a..2ecb36232e 100644
--- a/hw/char/trace-events
+++ b/hw/char/trace-events
@@ -103,5 +103,5 @@ exynos_uart_rx_timeout(uint32_t channel, uint32_t stat,
uint32_t intsp) "UART%d:
cadence_uart_baudrate(unsigned baudrate) "baudrate %u"
# sh_serial.c
-sh_serial_read(unsigned size, uint64_t offs, uint64_t val) " size %d offs
0x%02" PRIx64 " -> 0x%02" PRIx64
-sh_serial_write(unsigned size, uint64_t offs, uint64_t val) "size %d offs
0x%02" PRIx64 " <- 0x%02" PRIx64
+sh_serial_read(char *id, unsigned size, uint64_t offs, uint64_t val) " %s size
%d offs 0x%02" PRIx64 " -> 0x%02" PRIx64
+sh_serial_write(char *id, unsigned size, uint64_t offs, uint64_t val) "%s size
%d offs 0x%02" PRIx64 " <- 0x%02" PRIx64
--
2.21.4
- [PATCH v4 00/23] More SH4 clean ups, BALATON Zoltan, 2021/10/28
- [PATCH v4 04/23] hw/sh4/r2d: Use error_report instead of fprintf to stderr, BALATON Zoltan, 2021/10/28
- [PATCH v4 02/23] hw/char/sh_serial: Use hw_error instead of fprintf and abort, BALATON Zoltan, 2021/10/28
- [PATCH v4 05/23] hw/char/sh_serial: Rename type sh_serial_state to SHSerialState, BALATON Zoltan, 2021/10/28
- [PATCH v4 01/23] hw/sh4: Fix typos in a comment, BALATON Zoltan, 2021/10/28
- [PATCH v4 07/23] hw/char/sh_serial: Add device id to trace output,
BALATON Zoltan <=
- [PATCH v4 08/23] hw/intc/sh_intc: Use existing macro instead of local one, BALATON Zoltan, 2021/10/28
- [PATCH v4 10/23] hw/intc/sh_intc: Rename iomem region, BALATON Zoltan, 2021/10/28
- [PATCH v4 03/23] hw/sh4: Change debug printfs to traces, BALATON Zoltan, 2021/10/28
- [PATCH v4 15/23] hw/intc/sh_intc: Inline and drop sh_intc_source() function, BALATON Zoltan, 2021/10/28
- [PATCH v4 12/23] hw/intc/sh_intc: Move sh_intc_register() closer to its only user, BALATON Zoltan, 2021/10/28
- [PATCH v4 14/23] hw/intc/sh_intc: Use array index instead of pointer arithmetics, BALATON Zoltan, 2021/10/28
- [PATCH v4 19/23] hw/intc/sh_intc: Remove unneeded local variable initialisers, BALATON Zoltan, 2021/10/28