Commit 988fa103 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

trace: Eliminate use of TARGET_FMT_plx 



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
ec427498, v2.12.0.  Clean up by replacing TARGET_FMT_plx with its
macro expansion.

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

Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20190812052359.30071-7-armbru@redhat.com>
parent cbcbba98

hw/tpm/trace-events

+2 −2
Original line number Diff line number Diff line 
# 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"

scripts/tracetool/format/log_stap.py

+0 −3
Original line number Diff line number Diff line
@@ -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):