Modify debug macros to have the same format through the codebase and use regular
ifs instead of ifdef.
As the debug printf is always put in code, some formats had to be changed to
avoid warnings treated as errors at compile time.
Signed-off-by: Marc Marí <marc.mari.barc...@gmail.com>
---
hw/dma/i8257.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index 4490372..b4e0535 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -27,15 +27,16 @@
/* #define DEBUG_DMA */
-#define dolog(...) fprintf (stderr, "dma: " __VA_ARGS__)
#ifdef DEBUG_DMA
-#define linfo(...) fprintf (stderr, "dma: " __VA_ARGS__)
-#define ldebug(...) fprintf (stderr, "dma: " __VA_ARGS__)
+#define DEBUG_DMA_ENABLED 1
#else
-#define linfo(...)
-#define ldebug(...)
+#define DEBUG_DMA_ENABLED 0
#endif
+#define dolog(...) QEMU_DPRINTF(1, "dma", __VA_ARGS__)
+#define linfo(...) QEMU_DPRINTF(DEBUG_DMA_ENABLED, "dma", __VA_ARGS__);
+#define ldebug linfo
+
struct dma_regs {
int now[2];
uint16_t base[2];
@@ -301,7 +302,8 @@ static uint64_t read_cont(void *opaque, hwaddr nport,
unsigned size)
break;
}
- ldebug ("read_cont: nport %#06x, iport %#04x val %#x\n", nport, iport,
val);
+ ldebug ("read_cont: nport %#06" PRIx64 ", iport %#04x val %#x\n",
+ nport, iport, val);
return val;
}
--
1.7.10.4
