diff mbox

[v2,15/16] pci-host: Convert conditional compilation of debug printfs to regular ifs

Message ID 1399964572-5376-16-git-send-email-marc.mari.barcelo@gmail.com
State New
Headers show

Commit Message

Marc Marí May 13, 2014, 7:02 a.m. UTC 
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 casting had to be added to avoid
warnings treated as errors at compile time.

Signed-off-by: Marc Marí <marc.mari.barcelo@gmail.com>
---
 hw/pci-host/bonito.c  |   10 ++++++----
 hw/pci-host/ppce500.c |    8 ++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

Comments

Marc Marí May 13, 2014, 9:13 a.m. UTC | #1 
El Tue, 13 May 2014 09:02:51 +0200
Marc Marí <marc.mari.barcelo@gmail.com> escribió:
> diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
> index c80b7cb..dfeb19e 100644
> --- a/hw/pci-host/ppce500.c
> +++ b/hw/pci-host/ppce500.c
> @@ -21,12 +21,16 @@
>  #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

In this file, the function name is already written to the macro, so now
it will appear two times. The calls to the macro can be changed to not
add the function name, which, in my opinion, is a bit nicer.

Marc
diff mbox

Patch

diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 902441f..4a1dd20 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -50,11 +50,13 @@ 
 //#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 +237,7 @@  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 %x saddr %x\n", addr, (unsigned)val, saddr);
     switch (saddr) {
     case BONITO_BONPONCFG:
     case BONITO_IODEVCFG:
@@ -322,7 +324,7 @@  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 %x\n", addr, (unsigned)val);
     d->config_write(d, addr, val, 4);
 }
 
diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index c80b7cb..dfeb19e 100644
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -21,12 +21,16 @@ 
 #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