[Qemu-devel] [PATCH 56/61] ioapic: clean up of #ifdef DEBUG_IOAPIC.

[Isaku Yamahata]

remove unnecessary #ifdef DEBUG_IOAPIC.

Signed-off-by: Isaku Yamahata <address@hidden>
---
 hw/ioapic.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/hw/ioapic.c b/hw/ioapic.c
index e97e258..a9a8e00 100644
--- a/hw/ioapic.c
+++ b/hw/ioapic.c
@@ -26,6 +26,11 @@
 #include "host-utils.h"
 
 //#define DEBUG_IOAPIC
+#ifdef DEBUG_IOAPIC
+# define IOAPIC_DPRINTF(format, ...)    printf(format, ## __VA_ARGS__)
+#else
+# define IOAPIC_DPRINTF(format, ...)    do { } while (0)
+#endif
 
 #define IOAPIC_NUM_PINS                        0x18
 #define IOAPIC_LVT_MASKED              (1<<16)
@@ -148,9 +153,7 @@ static uint32_t ioapic_mem_readl(void *opaque, 
target_phys_addr_t addr)
                         val = s->ioredtbl[index] & 0xffffffff;
                 }
         }
-#ifdef DEBUG_IOAPIC
-        printf("I/O APIC read: %08x = %08x\n", s->ioregsel, val);
-#endif
+        IOAPIC_DPRINTF("I/O APIC read: %08x = %08x\n", s->ioregsel, val);
     }
     return val;
 }
@@ -165,9 +168,7 @@ static void ioapic_mem_writel(void *opaque, 
target_phys_addr_t addr, uint32_t va
         s->ioregsel = val;
         return;
     } else if (addr == 0x10) {
-#ifdef DEBUG_IOAPIC
-        printf("I/O APIC write: %08x = %08x\n", s->ioregsel, val);
-#endif
+        IOAPIC_DPRINTF("I/O APIC write: %08x = %08x\n", s->ioregsel, val);
         switch (s->ioregsel) {
             case 0x00:
                 s->id = (val >> 24) & 0xff;
-- 
1.6.0.2