On 7/26/19 2:05 PM, Markus Armbruster wrote:
> 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
> ec427498da5, v2.12.0. Clean up by replacing TARGET_FMT_plx with its
> macro expansion.
>
> scripts/tracetool/format/log_stap.py (commit 62dd1048c0b, 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>
> ---
> hw/tpm/trace-events | 4 ++--
> scripts/tracetool/format/log_stap.py | 3 ---
> 2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/hw/tpm/trace-events b/hw/tpm/trace-events
> index 0b94aa1526..25e47a595a 100644
> --- a/hw/tpm/trace-events
> +++ b/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 0x016%" 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"
> diff --git a/scripts/tracetool/format/log_stap.py b/scripts/tracetool/format/log_stap.py
> index 3ccbc09d61..9ab0cf2cce 100644
> --- a/scripts/tracetool/format/log_stap.py
> +++ b/scripts/tracetool/format/log_stap.py
> @@ -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):
>