misc: don't use hwaddr as a type in trace events

PATCH In review Daniel P. Berrangé 3 participants 3 messages Mar 6, 2018

lore

Share & tools

lore

Daniel P. Berrangé

author

2018-03-06 13:43 UTC #0 lore raw

PATCH v2 1/1 misc: don't use hwaddr as a type in trace events

Use types that are defined by QEMU in trace events caused build failures for the UST trace backend:

In file included from trace-ust-all.c:13:0:
trace-ust-all.h:11844:206: error: unknown type name ‘hwaddr’

It only knows about C built-in types, and any types that are pulled in from includs of qemu-common.h and lttng/tracepoint.h. This does not include the 'hwaddr' type, so replace it with a uint64_t which is what exec/hwaddr.h defines 'hwaddr' as. This fixes the build failure introduced by

commit 9eb8040c2d2b38e1a40bb6129b1b668fa178fcab
Author: Peter Maydell <[email protected]>
Date: Fri Mar 2 10:45:39 2018 +0000

hw/misc/tz-ppc: Model TrustZone peripheral protection controller

Signed-off-by Daniel P. Berrangé <[email protected]>

---
 hw/misc/trace-events | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

hw/misc/trace-events +2 -2

index eb5ffcc0a8..562d9ed005 100644
@@ -92,8 +92,8 @@ tz_ppc_cfg_sec_resp(int level) "TZ PPC: cfg_sec_resp = %d"
 tz_ppc_irq_enable(int level) "TZ PPC: int_enable = %d"
 tz_ppc_irq_clear(int level) "TZ PPC: int_clear = %d"
 tz_ppc_update_irq(int level) "TZ PPC: setting irq line to %d"
-tz_ppc_read_blocked(int n, hwaddr offset, bool secure, bool user) "TZ PPC: port %d offset 0x%" HWADDR_PRIx " read (secure %d user %d) blocked"
-tz_ppc_write_blocked(int n, hwaddr offset, bool secure, bool user) "TZ PPC: port %d offset 0x%" HWADDR_PRIx " write (secure %d user %d) blocked"
+tz_ppc_read_blocked(int n, uint64_t offset, bool secure, bool user) "TZ PPC: port %d offset 0x%" PRIx64 " read (secure %d user %d) blocked"
+tz_ppc_write_blocked(int n, uint64_t offset, bool secure, bool user) "TZ PPC: port %d offset 0x%" PRIx64 " write (secure %d user %d) blocked"
 
 # hw/misc/iotkit-secctl.c
 iotkit_secctl_s_read(uint32_t offset, uint64_t data, unsigned size) "IoTKit SecCtl S regs read: offset 0x%x data 0x%" PRIx64 " size %u"

Signature · 1 line

2.14.3

Peter Maydell

Reviewed-by on v2 1/1

2018-03-06 13:47 UTC #1 lore raw

Quoted 12 lines · Daniel P. Berrangé

Use types that are defined by QEMU in trace events caused build failures for the UST trace backend:
In file included from trace-ust-all.c:13:0:
trace-ust-all.h:11844:206: error: unknown type name ‘hwaddr’
It only knows about C built-in types, and any types that are pulled in from includs of qemu-common.h and lttng/tracepoint.h. This does not include the 'hwaddr' type, so replace it with a uint64_t which is what exec/hwaddr.h defines 'hwaddr' as. This fixes the build failure introduced by

Quoted 8 lines

commit 9eb8040c2d2b38e1a40bb6129b1b668fa178fcab
Author: Peter Maydell <[email protected]>
Date: Fri Mar 2 10:45:39 2018 +0000
hw/misc/tz-ppc: Model TrustZone peripheral protection controller
Signed-off-by Daniel P. Berrangé <[email protected]>
---

Reviewed-by Peter Maydell <[email protected]>

I'll apply this to master, since it will fix the travis build.

thanks
-- PMM

Philippe Mathieu-Daudé

Reviewed-by on v2 1/1

2018-03-06 18:55 UTC #2 lore raw

In reply to Daniel P. Berrangé

Quoted 12 lines · Daniel P. Berrangé

Use types that are defined by QEMU in trace events caused build failures for the UST trace backend:
In file included from trace-ust-all.c:13:0:
trace-ust-all.h:11844:206: error: unknown type name ‘hwaddr’
It only knows about C built-in types, and any types that are pulled in from includs of qemu-common.h and lttng/tracepoint.h. This does not include the 'hwaddr' type, so replace it with a uint64_t which is what exec/hwaddr.h defines 'hwaddr' as. This fixes the build failure introduced by

Quoted 7 lines

commit 9eb8040c2d2b38e1a40bb6129b1b668fa178fcab
Author: Peter Maydell <[email protected]>
Date: Fri Mar 2 10:45:39 2018 +0000
hw/misc/tz-ppc: Model TrustZone peripheral protection controller
Signed-off-by Daniel P. Berrangé <[email protected]>

Reviewed-by Philippe Mathieu-Daudé <[email protected]>

Quoted 20 lines

---
 hw/misc/trace-events | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

hw/misc/trace-events +2 -2

index eb5ffcc0a8..562d9ed005 100644
@@ -92,8 +92,8 @@ tz_ppc_cfg_sec_resp(int level) "TZ PPC: cfg_sec_resp = %d"
 tz_ppc_irq_enable(int level) "TZ PPC: int_enable = %d"
 tz_ppc_irq_clear(int level) "TZ PPC: int_clear = %d"
 tz_ppc_update_irq(int level) "TZ PPC: setting irq line to %d"
-tz_ppc_read_blocked(int n, hwaddr offset, bool secure, bool user) "TZ PPC: port %d offset 0x%" HWADDR_PRIx " read (secure %d user %d) blocked"
-tz_ppc_write_blocked(int n, hwaddr offset, bool secure, bool user) "TZ PPC: port %d offset 0x%" HWADDR_PRIx " write (secure %d user %d) blocked"
+tz_ppc_read_blocked(int n, uint64_t offset, bool secure, bool user) "TZ PPC: port %d offset 0x%" PRIx64 " read (secure %d user %d) blocked"
+tz_ppc_write_blocked(int n, uint64_t offset, bool secure, bool user) "TZ PPC: port %d offset 0x%" PRIx64 " write (secure %d user %d) blocked"
 
 # hw/misc/iotkit-secctl.c
 iotkit_secctl_s_read(uint32_t offset, uint64_t data, unsigned size) "IoTKit SecCtl S regs read: offset 0x%x data 0x%" PRIx64 " size %u"