[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] arm: soc-dma: use hwaddr instead of target_ulong in
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH] arm: soc-dma: use hwaddr instead of target_ulong in printf |
Date: |
Fri, 4 Dec 2015 13:28:50 +0100 |
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 <address@hidden>
---
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));
exit(-1);
}
@@ -284,10 +283,9 @@ void soc_dma_port_add_fifo(struct soc_dma_s *soc, hwaddr
virt_base,
while (entry < dma->memmap + dma->memmap_size &&
entry->addr <= virt_base) {
if (entry->addr == virt_base && entry->u.fifo.out == out) {
- fprintf(stderr, "%s: FIFO at " TARGET_FMT_lx
- " collides FIFO at " TARGET_FMT_lx "\n",
- __FUNCTION__, (target_ulong) virt_base,
- (target_ulong) entry->addr);
+ fprintf(stderr, "%s: FIFO at %"PRIx64
+ " collides FIFO at %"PRIx64 "\n",
+ __FUNCTION__, virt_base, entry->addr);
exit(-1);
}
@@ -322,13 +320,11 @@ void soc_dma_port_add_mem(struct soc_dma_s *soc, uint8_t
*phys_base,
if ((entry->addr >= virt_base && entry->addr < virt_base + size) ||
(entry->addr <= virt_base &&
entry->addr + entry->u.mem.size > virt_base)) {
- fprintf(stderr, "%s: RAM at " TARGET_FMT_lx "-" TARGET_FMT_lx
- " collides with RAM region at " TARGET_FMT_lx
- "-" TARGET_FMT_lx "\n", __FUNCTION__,
- (target_ulong) virt_base,
- (target_ulong) (virt_base + size),
- (target_ulong) entry->addr, (target_ulong)
- (entry->addr + entry->u.mem.size));
+ fprintf(stderr, "%s: RAM at %"PRIx64 "-%"PRIx64
+ " collides with RAM region at %"PRIx64
+ "-%"PRIx64 "\n", __FUNCTION__,
+ virt_base, virt_base + size,
+ entry->addr, entry->addr + entry->u.mem.size);
exit(-1);
}
@@ -337,12 +333,11 @@ void soc_dma_port_add_mem(struct soc_dma_s *soc, uint8_t
*phys_base,
} else {
if (entry->addr >= virt_base &&
entry->addr < virt_base + size) {
- fprintf(stderr, "%s: RAM at " TARGET_FMT_lx "-" TARGET_FMT_lx
- " collides with FIFO at " TARGET_FMT_lx
+ fprintf(stderr, "%s: RAM at %"PRIx64 "-%"PRIx64
+ " collides with FIFO at %"PRIx64
"\n", __FUNCTION__,
- (target_ulong) virt_base,
- (target_ulong) (virt_base + size),
- (target_ulong) entry->addr);
+ virt_base, virt_base + size,
+ entry->addr);
exit(-1);
}
--
1.8.3.1
- [Qemu-devel] [PATCH] arm: soc-dma: use hwaddr instead of target_ulong in printf,
Paolo Bonzini <=
- [Qemu-devel] [PATCH] arm: explicitly mark loads as little-endian, Paolo Bonzini, 2015/12/04
- Re: [Qemu-devel] [PATCH] arm: soc-dma: use hwaddr instead of target_ulong in printf, Peter Maydell, 2015/12/04
- Re: [Qemu-devel] [PATCH] arm: soc-dma: use hwaddr instead of target_ulong in printf, Paolo Bonzini, 2015/12/04
- Re: [Qemu-devel] [PATCH] arm: soc-dma: use hwaddr instead of target_ulong in printf, Peter Maydell, 2015/12/04
- Re: [Qemu-devel] [PATCH] arm: soc-dma: use hwaddr instead of target_ulong in printf, Paolo Bonzini, 2015/12/04
- Re: [Qemu-devel] [PATCH] arm: soc-dma: use hwaddr instead of target_ulong in printf, Peter Maydell, 2015/12/04
- Re: [Qemu-devel] [PATCH] arm: soc-dma: use hwaddr instead of target_ulong in printf, Peter Maydell, 2015/12/15
- Re: [Qemu-devel] [PATCH] arm: soc-dma: use hwaddr instead of target_ulong in printf, Paolo Bonzini, 2015/12/15