On 04/12/2015 13:33, Peter Maydell wrote: > On 4 December 2015 at 12:28, Paolo Bonzini <pbonz...@redhat.com> wrote: >> This is a first baby step towards removing widespread inclusion of >> cpu.h and compiling more devices once (so that arm, aarch64 and >> in the future target-multi can share the object files). >> >> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> >> --- >> hw/dma/soc_dma.c | 37 ++++++++++++++++--------------------- >> 1 file changed, 16 insertions(+), 21 deletions(-) >> >> diff --git a/hw/dma/soc_dma.c b/hw/dma/soc_dma.c >> index c06aabb..ac395c5 100644 >> --- a/hw/dma/soc_dma.c >> +++ b/hw/dma/soc_dma.c >> @@ -269,11 +269,10 @@ void soc_dma_port_add_fifo(struct soc_dma_s *soc, >> hwaddr virt_base, >> if (entry->type == soc_dma_port_mem) { >> if (entry->addr <= virt_base && >> entry->addr + entry->u.mem.size > virt_base) { >> - fprintf(stderr, "%s: FIFO at " TARGET_FMT_lx >> - " collides with RAM region at " >> TARGET_FMT_lx >> - "-" TARGET_FMT_lx "\n", __FUNCTION__, >> - (target_ulong) virt_base, >> - (target_ulong) entry->addr, (target_ulong) >> + fprintf(stderr, "%s: FIFO at %"PRIx64 >> + " collides with RAM region at %"PRIx64 >> + "-%"PRIx64 "\n", __FUNCTION__, >> + virt_base, entry->addr, >> (entry->addr + entry->u.mem.size)); > > Is using the HWADDR_PRI* macros for printing hwaddrs deprecated now?
It's the first time I hear about them. :) There are still 130-odd usages of HWADDR_PRIx and friends, so at least it's an incomplete transition. So I can use them if the maintainer tells me to. Paolo