[Qemu-devel] [PATCH v3 02/16] x86: Convert debug printfs to QEMU_DPRINTF

["Marc Marí" <marc.mari.barcelo@gmail.com>]

Modify debug macros to have the same format through the codebase and use regular
ifs instead of ifdef.

Signed-off-by: Marc Marí <marc.mari.barcelo@gmail.com>
---
 hw/i386/kvm/pci-assign.c |   11 ++++++-----
 hw/i386/multiboot.c      |    7 +++++--
 target-i386/kvm.c        |    9 +++++----
 xen-hvm.c                |    9 +++++----
 xen-mapcache.c           |    9 +++++----
 5 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index de33657..21330a9 100644
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@@ -51,14 +51,15 @@
 //#define DEVICE_ASSIGNMENT_DEBUG
 
 #ifdef DEVICE_ASSIGNMENT_DEBUG
-#define DEBUG(fmt, ...)                                       \
-    do {                                                      \
-        fprintf(stderr, "%s: " fmt, __func__ , __VA_ARGS__);  \
-    } while (0)
+#define DEVICE_ASSIGNMENT_DEBUG_ENABLED 1
 #else
-#define DEBUG(fmt, ...)
+#define DEVICE_ASSIGNMENT_DEBUG_ENABLED 0
 #endif
 
+#define DEBUG(fmt, ...) \
+    QEMU_DPRINTF(DEVICE_ASSIGNMENT_DEBUG_ENABLED, \
+                "pci_assign", fmt, ## __VA_ARGS__)
+
 typedef struct PCIRegion {
     int type;           /* Memory or port I/O */
     int valid;
diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
index 985ca1e..cd04339 100644
--- a/hw/i386/multiboot.c
+++ b/hw/i386/multiboot.c
@@ -33,11 +33,14 @@
 //#define DEBUG_MULTIBOOT
 
 #ifdef DEBUG_MULTIBOOT
-#define mb_debug(a...) fprintf(stderr, ## a)
+#define DEBUG_MULTIBOOT_ENABLED 1
 #else
-#define mb_debug(a...)
+#define DEBUG_MULTIBOOT_ENABLED 0
 #endif
 
+#define mb_debug(...) \
+    QEMU_DPRINTF(DEBUG_MULTIBOOT_ENABLED, "i386 multiboot", __VA_ARGS__)
+
 #define MULTIBOOT_STRUCT_ADDR 0x9000
 
 #if MULTIBOOT_STRUCT_ADDR > 0xf0000
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 0d894ef..53098ad 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -39,13 +39,14 @@
 //#define DEBUG_KVM
 
 #ifdef DEBUG_KVM
-#define DPRINTF(fmt, ...) \
-    do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0)
+#define DEBUG_KVM_ENABLED 1
 #else
-#define DPRINTF(fmt, ...) \
-    do { } while (0)
+#define DEBUG_KVM_ENABLED 0
 #endif
 
+#define DPRINTF(fmt, ...) \
+    QEMU_DPRINTF(DEBUG_KVM_ENABLED, "i386 kvm", fmt, ## __VA_ARGS__)
+
 #define MSR_KVM_WALL_CLOCK  0x11
 #define MSR_KVM_SYSTEM_TIME 0x12
 
diff --git a/xen-hvm.c b/xen-hvm.c
index a64486c..a0d0bf1 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -29,13 +29,14 @@
 //#define DEBUG_XEN_HVM
 
 #ifdef DEBUG_XEN_HVM
-#define DPRINTF(fmt, ...) \
-    do { fprintf(stderr, "xen: " fmt, ## __VA_ARGS__); } while (0)
+#define DEBUG_XEN_HVM_ENABLED 1
 #else
-#define DPRINTF(fmt, ...) \
-    do { } while (0)
+#define DEBUG_XEN_HVM_ENABLED 0
 #endif
 
+#define DPRINTF(fmt, ...) \
+    QEMU_DPRINTF(DEBUG_XEN_HVM_ENABLED, "xen", fmt, ## __VA_ARGS__)
+
 static MemoryRegion ram_memory, ram_640k, ram_lo, ram_hi;
 static MemoryRegion *framebuffer;
 static bool xen_in_migration;
diff --git a/xen-mapcache.c b/xen-mapcache.c
index eda914a..c6a72c5 100644
--- a/xen-mapcache.c
+++ b/xen-mapcache.c
@@ -26,13 +26,14 @@
 //#define MAPCACHE_DEBUG
 
 #ifdef MAPCACHE_DEBUG
-#  define DPRINTF(fmt, ...) do { \
-    fprintf(stderr, "xen_mapcache: " fmt, ## __VA_ARGS__); \
-} while (0)
+#define MAPCACHE_DEBUG_ENABLED 1
 #else
-#  define DPRINTF(fmt, ...) do { } while (0)
+#define MAPCACHE_DEBUG_ENABLED 0
 #endif
 
+#define DPRINTF(fmt, ...) \
+    QEMU_DPRINTF(MAPCACHE_DEBUG_ENABLED, "xen_mapcache", fmt, ## __VA_ARGS__)
+
 #if defined(__i386__)
 #  define MCACHE_BUCKET_SHIFT 16
 #  define MCACHE_MAX_SIZE     (1UL<<31) /* 2GB Cap */
-- 
1.7.10.4