[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/25] arm: soc-dma: use hwaddr instead of target_ulo
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 03/25] arm: soc-dma: use hwaddr instead of target_ulong in printf |
Date: |
Thu, 17 Dec 2015 11:49:58 +0000 |
From: Paolo Bonzini <address@hidden>
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>
Reviewed-by: Peter Maydell <address@hidden>
[PMM: changed __FUNCTION__ to __func__ since we're touching
these lines of code anyway]
Signed-off-by: Peter Maydell <address@hidden>
---
hw/dma/soc_dma.c | 39 +++++++++++++++++----------------------
1 file changed, 17 insertions(+), 22 deletions(-)
diff --git a/hw/dma/soc_dma.c b/hw/dma/soc_dma.c
index c06aabb..94be376 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", __func__,
+ 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",
+ __func__, 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", __func__,
+ 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
- "\n", __FUNCTION__,
- (target_ulong) virt_base,
- (target_ulong) (virt_base + size),
- (target_ulong) entry->addr);
+ fprintf(stderr, "%s: RAM at %"PRIx64 "-%"PRIx64
+ " collides with FIFO at %"PRIx64
+ "\n", __func__,
+ virt_base, virt_base + size,
+ entry->addr);
exit(-1);
}
--
1.9.1
- [Qemu-devel] [PULL 21/25] tests/guest-debug: introduce basic gdbstub tests, (continued)
- [Qemu-devel] [PULL 21/25] tests/guest-debug: introduce basic gdbstub tests, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 18/25] target-arm: kvm - support for single step, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 10/25] ARM: ACPI: Add power button device in ACPI DSDT table, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 15/25] ARM: Virt: Add gpio-keys node for Poweroff using DT, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 16/25] target-arm: kvm64 - introduce kvm_arm_init_debug(), Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 25/25] i.MX: Add an i.MX25 specific CCM class/instance, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 14/25] ARM: Virt: Add QEMU powerdown notifier and hook it to GPIO Pin 3, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 07/25] acpi: extend aml_interrupt() to support multiple irqs, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 12/25] ACPI: Add aml_gpio_int() wrapper for GPIO Interrupt Connection, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 08/25] ARM: Virt: Add a GPIO controller, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 03/25] arm: soc-dma: use hwaddr instead of target_ulong in printf,
Peter Maydell <=
- [Qemu-devel] [PULL 01/25] i.MX: add support for lower and upper interrupt in GPIO., Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 04/25] target-arm: raise exception on misaligned LDREX operands, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 09/25] ARM: ACPI: Add GPIO controller in ACPI DSDT table, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 13/25] ARM: ACPI: Add _E03 for Power Button, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 11/25] ACPI: Add GPIO Connection Descriptor, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 06/25] acpi: support serialized method, Peter Maydell, 2015/12/17
- [Qemu-devel] [PULL 02/25] arm: explicitly mark device loads as little-endian, Peter Maydell, 2015/12/17
- Re: [Qemu-devel] [PULL 00/25] target-arm queue, Peter Maydell, 2015/12/17