[Qemu-devel] [PATCH v2 22/30] trace: Fix parameter types in hw/nvram

[Eric Blake <eblake@redhat.com>]

An upcoming patch will let the compiler warn us when we are silently
losing precision in traces; update the traces to use types matching
the callers, and in this case, make sure all callers pass the same
width type.

Signed-off-by: Eric Blake <eblake@redhat.com>
---
 hw/nvram/fw_cfg.c     | 2 +-
 hw/nvram/trace-events | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 316fca9..5c328c8 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -435,7 +435,7 @@ static void fw_cfg_dma_transfer(FWCfgState *s)
     stl_be_dma(s->dma_as, dma_addr + offsetof(FWCfgDmaAccess, control),
                 dma.control);

-    trace_fw_cfg_read(s, 0);
+    trace_fw_cfg_read(s, (uint64_t) 0);
 }

 static uint64_t fw_cfg_dma_mem_read(void *opaque, hwaddr addr,
diff --git a/hw/nvram/trace-events b/hw/nvram/trace-events
index 1f1e05a..32d67c2 100644
--- a/hw/nvram/trace-events
+++ b/hw/nvram/trace-events
@@ -1,8 +1,8 @@
 # See docs/tracing.txt for syntax documentation.

 # hw/nvram/ds1225y.c
-nvram_read(uint32_t addr, uint32_t ret) "read addr %d: 0x%02x"
-nvram_write(uint32_t addr, uint32_t old, uint32_t val) "write addr %d: 0x%02x -> 0x%02x"
+nvram_read(hwaddr addr, uint32_t ret) "read addr %" HWADDR_PRId ": 0x%02x"
+nvram_write(hwaddr addr, uint32_t old, uint64_t val) "write addr %" HWADDR_PRId ": 0x%02x -> 0x%02" PRIx64

 # hw/nvram/fw_cfg.c
 fw_cfg_select(void *s, uint16_t key, int ret) "%p key %d = %d"
-- 
2.9.3