[Qemu-devel] [PATCH v3 16/16] common: 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.

Signed-off-by: Marc Marí <address@hidden>
---
 migration-rdma.c |   31 +++++++++++++++++--------------
 page_cache.c     |   11 +++++++----
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/migration-rdma.c b/migration-rdma.c
index eeb4302..606ee7c 100644
--- a/migration-rdma.c
+++ b/migration-rdma.c
@@ -32,36 +32,39 @@
 //#define DEBUG_RDMA_REALLY_VERBOSE
 
 #ifdef DEBUG_RDMA
-#define DPRINTF(fmt, ...) \
-    do { printf("rdma: " fmt, ## __VA_ARGS__); } while (0)
+#define DEBUG_RDMA_ENABLED 1
 #else
-#define DPRINTF(fmt, ...) \
-    do { } while (0)
+#define DEBUG_RDMA_ENABLED 0
 #endif
 
+#define DPRINTF(fmt, ...) \
+    QEMU_DPRINTF(DEBUG_RDMA_ENABLED, "rdma", fmt, ## __VA_ARGS__)
+
 #ifdef DEBUG_RDMA_VERBOSE
-#define DDPRINTF(fmt, ...) \
-    do { printf("rdma: " fmt, ## __VA_ARGS__); } while (0)
+#define DEBUG_RDMA_VERBOSE_ENABLED 1
 #else
-#define DDPRINTF(fmt, ...) \
-    do { } while (0)
+#define DEBUG_RDMA_VERBOSE_ENABLED 0
 #endif
 
+#define DDPRINTF(fmt, ...) \
+    QEMU_DPRINTF(DEBUG_RDMA_VERBOSE_ENABLED, "rdma", fmt, ## __VA_ARGS__)
+
 #ifdef DEBUG_RDMA_REALLY_VERBOSE
-#define DDDPRINTF(fmt, ...) \
-    do { printf("rdma: " fmt, ## __VA_ARGS__); } while (0)
+#define DEBUG_RDMA_REALLY_VERBOSE_ENABLED 1
 #else
-#define DDDPRINTF(fmt, ...) \
-    do { } while (0)
+#define DEBUG_RDMA_REALLY_VERBOSE_ENABLED 0
 #endif
 
+#define DDDPRINTF(fmt, ...) \
+    QEMU_DPRINTF(DEBUG_RDMA_REALLY_VERBOSE_ENABLED, "rdma", fmt, ## 
__VA_ARGS__)
+
 /*
  * Print and error on both the Monitor and the Log file.
  */
 #define ERROR(errp, fmt, ...) \
     do { \
-        fprintf(stderr, "RDMA ERROR: " fmt "\n", ## __VA_ARGS__); \
-        if (errp && (*(errp) == NULL)) { \
+        QEMU_DPRINTF(1, "RDMA ERROR", fmt"\n", ## __VA_ARGS__); \
+        if (errp && !*errp) { \
             error_setg(errp, "RDMA ERROR: " fmt, ## __VA_ARGS__); \
         } \
     } while (0)
diff --git a/page_cache.c b/page_cache.c
index b033681..be206a4 100644
--- a/page_cache.c
+++ b/page_cache.c
@@ -25,14 +25,17 @@
 #include "qemu-common.h"
 #include "migration/page_cache.h"
 
+//#define DEBUG_CACHE 1
+
 #ifdef DEBUG_CACHE
-#define DPRINTF(fmt, ...) \
-    do { fprintf(stdout, "cache: " fmt, ## __VA_ARGS__); } while (0)
+#define DEBUG_CACHE_ENABLED 1
 #else
-#define DPRINTF(fmt, ...) \
-    do { } while (0)
+#define DEBUG_CACHE_ENABLED 0 
 #endif
 
+#define DPRINTF(fmt, ...) \
+    QEMU_DPRINTF(DEBUG_CACHE_ENABLED, "cache", fmt, ## __VA_ARGS__)
+
 typedef struct CacheItem CacheItem;
 
 struct CacheItem {
-- 
1.7.10.4