[10/43] s390x: made printf always compile in debug output

Commit Message

Danil Antonov April 1, 2017, 1:45 p.m. UTC

From ea9cd8f02bd98548435f561e62f4f9b672318bcb Mon Sep 17 00:00:00 2001
From: Danil Antonov <[e-mail]>
Date: Wed, 29 Mar 2017 12:26:05 +0300
Subject: [PATCH 10/43] s390x: made printf always compile in debug output

Wrapped printf calls inside debug macros (DPRINTF) in `if` statement.
This will ensure that printf function will always compile even if debug
output is turned off and, in turn, will prevent bitrot of the format
strings.

Signed-off-by: Danil Antonov <[e-mail]>
---
 target/s390x/kvm.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Comments

Cornelia Huck April 3, 2017, 8:34 a.m. UTC | #1

On Sat, 1 Apr 2017 16:45:53 +0300
Danil Antonov <[e-mail]> wrote:

> From ea9cd8f02bd98548435f561e62f4f9b672318bcb Mon Sep 17 00:00:00 2001
> From: Danil Antonov <[e-mail]>
> Date: Wed, 29 Mar 2017 12:26:05 +0300
> Subject: [PATCH 10/43] s390x: made printf always compile in debug output

s/made/make/

(Not sure where the headers above came from; might be gmail.)

> 
> Wrapped printf calls inside debug macros (DPRINTF) in `if` statement.
> This will ensure that printf function will always compile even if debug
> output is turned off and, in turn, will prevent bitrot of the format
> strings.
> 
> Signed-off-by: Danil Antonov <[e-mail]>
> ---
>  target/s390x/kvm.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)

Seems reasonable; although we should convert to tracepoints later.

Queued for 2.10 (with the commit message slightly tweaked).

Patch

diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index ac47154..ac994fe 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -47,15 +47,15 @@ 
 #include "exec/memattrs.h"
 #include "hw/s390x/s390-virtio-ccw.h"

-/* #define DEBUG_KVM */
-
-#ifdef DEBUG_KVM
-#define DPRINTF(fmt, ...) \
-    do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0)
-#else
-#define DPRINTF(fmt, ...) \
-    do { } while (0)
-#endif
+#ifndef DEBUG_KVM
+#define DEBUG_KVM  0
+#endif
+
+#define DPRINTF(fmt, ...) do {                \
+    if (DEBUG_KVM) {                          \
+        fprintf(stderr, fmt, ## __VA_ARGS__); \
+    }                                         \
+} while (0);

 #define kvm_vm_check_mem_attr(s, attr) \
     kvm_vm_check_attr(s, KVM_S390_VM_MEM_CTRL, attr)