Skip to content

Commit

Permalink
trace: Eliminate use of TARGET_FMT_plx
Browse files Browse the repository at this point in the history
hw/tpm/trace-events uses TARGET_FMT_plx formats with uint64_t
arguments.  That's wrong, TARGET_FMT_plx takes hwaddr.  Since hwaddr
happens to be uint64_t, it works anyway.  Messed up in commit
ec42749, v2.12.0.  Clean up by replacing TARGET_FMT_plx with its
macro expansion.

scripts/tracetool/format/log_stap.py (commit 62dd104, v4.0.0) has
a special case for TARGET_FMT_plx.  Delete it.

Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20190812052359.30071-7-armbru@redhat.com>
  • Loading branch information
Markus Armbruster committed Aug 16, 2019
1 parent cbcbba9 commit 988fa10
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
4 changes: 2 additions & 2 deletions hw/tpm/trace-events
@@ -1,8 +1,8 @@
# See docs/devel/tracing.txt for syntax documentation.

# tpm_crb.c
tpm_crb_mmio_read(uint64_t addr, unsigned size, uint32_t val) "CRB read 0x" TARGET_FMT_plx " len:%u val: 0x%" PRIx32
tpm_crb_mmio_write(uint64_t addr, unsigned size, uint32_t val) "CRB write 0x" TARGET_FMT_plx " len:%u val: 0x%" PRIx32
tpm_crb_mmio_read(uint64_t addr, unsigned size, uint32_t val) "CRB read 0x%016" PRIx64 " len:%u val: 0x%" PRIx32
tpm_crb_mmio_write(uint64_t addr, unsigned size, uint32_t val) "CRB write 0x%016" PRIx64 " len:%u val: 0x%" PRIx32

# tpm_passthrough.c
tpm_passthrough_handle_request(void *cmd) "processing command %p"
Expand Down
3 changes: 0 additions & 3 deletions scripts/tracetool/format/log_stap.py
Expand Up @@ -30,9 +30,6 @@ def c_macro_to_format(macro):
if macro.startswith("PRI"):
return macro[3]

if macro == "TARGET_FMT_plx":
return "%016x"

raise Exception("Unhandled macro '%s'" % macro)

def c_fmt_to_stap(fmt):
Expand Down

0 comments on commit 988fa10

Please sign in to comment.