[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [Qemu-trivial] [PATCH] misc, ide: remove use of HWADDR_
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [Qemu-trivial] [PATCH] misc, ide: remove use of HWADDR_PRIx in trace events |
Date: |
Tue, 6 Mar 2018 15:57:17 -0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 |
On 03/06/2018 10:44 AM, Daniel P. Berrangé wrote:
> The trace events all use a uint64_t data type, so should be using the
> corresponding PRIx64 format, not HWADDR_PRIx which is intended for use
> with the 'hwaddr' type.
>
> Signed-off-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> hw/ide/trace-events | 4 ++--
> hw/misc/trace-events | 8 ++++----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/hw/ide/trace-events b/hw/ide/trace-events
> index 0c39cabe72..5c0e59ec42 100644
> --- a/hw/ide/trace-events
> +++ b/hw/ide/trace-events
> @@ -108,8 +108,8 @@ ahci_dma_prepare_buf_fail(void *s, int port)
> "ahci(%p)[%d]: sglist population fa
> ahci_dma_rw_buf(void *s, int port, int l) "ahci(%p)[%d] len=0x%x"
> ahci_cmd_done(void *s, int port) "ahci(%p)[%d]: cmd done"
> ahci_reset(void *s) "ahci(%p): HBA reset"
> -allwinner_ahci_mem_read(void *s, void *a, uint64_t addr, uint64_t val,
> unsigned size) "ahci(%p): read a=%p addr=0x%"HWADDR_PRIx" val=0x%"PRIx64",
> size=%d"
> -allwinner_ahci_mem_write(void *s, void *a, uint64_t addr, uint64_t val,
> unsigned size) "ahci(%p): write a=%p addr=0x%"HWADDR_PRIx" val=0x%"PRIx64",
> size=%d"
> +allwinner_ahci_mem_read(void *s, void *a, uint64_t addr, uint64_t val,
> unsigned size) "ahci(%p): read a=%p addr=0x%"PRIx64" val=0x%"PRIx64", size=%d"
> +allwinner_ahci_mem_write(void *s, void *a, uint64_t addr, uint64_t val,
> unsigned size) "ahci(%p): write a=%p addr=0x%"PRIx64" val=0x%"PRIx64",
> size=%d"
>
> # Warning: Verbose
> handle_reg_h2d_fis_dump(void *s, int port, const char *fis) "ahci(%p)[%d]:
> %s"
> diff --git a/hw/misc/trace-events b/hw/misc/trace-events
> index 562d9ed005..ec5a9f0da1 100644
> --- a/hw/misc/trace-events
> +++ b/hw/misc/trace-events
> @@ -69,13 +69,13 @@ mps2_fpgaio_reset(void) "MPS2 FPGAIO: reset"
> mps2_fpgaio_leds(char led1, char led0) "MPS2 FPGAIO LEDs: %c%c"
>
> # hw/misc/msf2-sysreg.c
> -msf2_sysreg_write(uint64_t offset, uint32_t val, uint32_t prev) "msf2-sysreg
> write: addr 0x%08" HWADDR_PRIx " data 0x%" PRIx32 " prev 0x%" PRIx32
> -msf2_sysreg_read(uint64_t offset, uint32_t val) "msf2-sysreg read: addr
> 0x%08" HWADDR_PRIx " data 0x%08" PRIx32
> +msf2_sysreg_write(uint64_t offset, uint32_t val, uint32_t prev) "msf2-sysreg
> write: addr 0x%08" PRIx64 " data 0x%" PRIx32 " prev 0x%" PRIx32
> +msf2_sysreg_read(uint64_t offset, uint32_t val) "msf2-sysreg read: addr
> 0x%08" PRIx64 " data 0x%08" PRIx32
> msf2_sysreg_write_pll_status(void) "Invalid write to read only PLL status
> register"
>
> #hw/misc/imx7_gpr.c
> -imx7_gpr_read(uint64_t offset) "addr 0x%08" HWADDR_PRIx
> -imx7_gpr_write(uint64_t offset, uint64_t value) "addr 0x%08" HWADDR_PRIx
> "value 0x%08" HWADDR_PRIx
> +imx7_gpr_read(uint64_t offset) "addr 0x%08" PRIx64
> +imx7_gpr_write(uint64_t offset, uint64_t value) "addr 0x%08" PRIx64 "value
> 0x%08" PRIx64
>
> # hw/misc/mos6522.c
> mos6522_set_counter(int index, unsigned int val) "T%d.counter=%d"
>