@@ -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(d->id, "write", size, offs, val);
switch (offs) {
case 0x00: /* SMR */
s->smr = val & ((s->feat & SH_SERIAL_FEAT_SCIF) ? 0x7b : 0xff);
@@ -213,6 +214,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
@@ -305,7 +307,7 @@ static uint64_t sh_serial_read(void *opaque, hwaddr offs,
break;
}
}
- trace_sh_serial("read ", size, offs, ret);
+ trace_sh_serial(d->id, "read ", size, offs, ret);
if (ret & ~((1 << 16) - 1)) {
qemu_log_mask(LOG_UNIMP, "sh_serial: unsupported read from 0x%02"
@@ -103,4 +103,4 @@ 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(const char *op, unsigned size, uint64_t offs, uint64_t val) "%s size %d offs 0x%02" PRIx64 " val 0x%02" PRIx64
+sh_serial(char *id, const char *op, unsigned size, uint64_t offs, uint64_t val) "%s %s size %d offs 0x%02" PRIx64 " val 0x%02" PRIx64
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> --- hw/char/sh_serial.c | 6 ++++-- hw/char/trace-events | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)