[Qemu-devel] [PATCH v3 15/16] pci-host: Convert debug printfs to QEMU_DPRINTF

[Marc Marí]

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.

As QEMU_DPRINTF already puts the function name as the header, __func__ was
removed from debug printfs.

Signed-off-by: Marc Marí <address@hidden>
---
 hw/pci-host/bonito.c  |   13 +++++++++----
 hw/pci-host/ppce500.c |   21 +++++++++++++--------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 56292ad..814b6d8 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -50,11 +50,14 @@
 //#define DEBUG_BONITO
 
 #ifdef DEBUG_BONITO
-#define DPRINTF(fmt, ...) fprintf(stderr, "%s: " fmt, __FUNCTION__, 
##__VA_ARGS__)
+#define DEBUG_BONITO_ENABLED 1
 #else
-#define DPRINTF(fmt, ...)
+#define DEBUG_BONITO_ENABLED 0
 #endif
 
+#define DPRINTF(fmt, ...) \
+    QEMU_DPRINTF(DEBUG_BONITO_ENABLED, "bonito", fmt, ## __VA_ARGS__)
+
 /* from linux soure code. include/asm-mips/mips-boards/bonito64.h*/
 #define BONITO_BOOT_BASE        0x1fc00000
 #define BONITO_BOOT_SIZE        0x00100000
@@ -235,7 +238,8 @@ static void bonito_writel(void *opaque, hwaddr addr,
 
     saddr = (addr - BONITO_REGBASE) >> 2;
 
-    DPRINTF("bonito_writel "TARGET_FMT_plx" val %x saddr %x\n", addr, val, 
saddr);
+    DPRINTF("bonito_writel "TARGET_FMT_plx" val %" PRIx64 " saddr %x\n",
+            addr, val, saddr);
     switch (saddr) {
     case BONITO_BONPONCFG:
     case BONITO_IODEVCFG:
@@ -322,7 +326,8 @@ static void bonito_pciconf_writel(void *opaque, hwaddr addr,
     PCIBonitoState *s = opaque;
     PCIDevice *d = PCI_DEVICE(s);
 
-    DPRINTF("bonito_pciconf_writel "TARGET_FMT_plx" val %x\n", addr, val);
+    DPRINTF("bonito_pciconf_writel "TARGET_FMT_plx" val %" PRIx64 "\n",
+            addr, val);
     d->config_write(d, addr, val, 4);
 }
 
diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index c80b7cb..ff250ce 100644
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -21,12 +21,17 @@
 #include "qemu/bswap.h"
 #include "hw/pci-host/ppce500.h"
 
+//#define DEBUG_PCI
+
 #ifdef DEBUG_PCI
-#define pci_debug(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
+#define DEBUG_PCI_ENABLED 1
 #else
-#define pci_debug(fmt, ...)
+#define DEBUG_PCI_ENABLED 0
 #endif
 
+#define pci_debug(fmt, ...) \
+    QEMU_DPRINTF(DEBUG_PCI_ENABLED, "ppce500", fmt, ## __VA_ARGS__)
+
 #define PCIE500_CFGADDR       0x0
 #define PCIE500_CFGDATA       0x4
 #define PCIE500_REG_BASE      0xC00
@@ -174,7 +179,7 @@ static uint64_t pci_reg_read4(void *opaque, hwaddr addr,
         break;
     }
 
-    pci_debug("%s: win:%lx(addr:" TARGET_FMT_plx ") -> value:%x\n", __func__,
+    pci_debug("win:%lx(addr:" TARGET_FMT_plx ") -> value:%x\n", 
               win, addr, value);
     return value;
 }
@@ -188,8 +193,8 @@ static void pci_reg_write4(void *opaque, hwaddr addr,
 
     win = addr & 0xfe0;
 
-    pci_debug("%s: value:%x -> win:%lx(addr:" TARGET_FMT_plx ")\n",
-              __func__, (unsigned)value, win, addr);
+    pci_debug("value:%" PRIx64 " -> win:%lx(addr:" TARGET_FMT_plx ")\n",
+              value, win, addr);
 
     switch (win) {
     case PPCE500_PCI_OW1:
@@ -259,8 +264,8 @@ static int mpc85xx_pci_map_irq(PCIDevice *pci_dev, int 
irq_num)
 
     ret = ppce500_pci_map_irq_slot(devno, irq_num);
 
-    pci_debug("%s: devfn %x irq %d -> %d  devno:%x\n", __func__,
-           pci_dev->devfn, irq_num, ret, devno);
+    pci_debug("devfn %x irq %d -> %d  devno:%x\n",
+                pci_dev->devfn, irq_num, ret, devno);
 
     return ret;
 }
@@ -269,7 +274,7 @@ static void mpc85xx_pci_set_irq(void *opaque, int irq_num, 
int level)
 {
     qemu_irq *pic = opaque;
 
-    pci_debug("%s: PCI irq %d, level:%d\n", __func__, irq_num, level);
+    pci_debug("PCI irq %d, level:%d\n", irq_num, level);
 
     qemu_set_irq(pic[irq_num], level);
 }
-- 
1.7.10.4