[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.10 03/10] s390x/pci: make printf always compil
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH for-2.10 03/10] s390x/pci: make printf always compile in debug output |
Date: |
Thu, 6 Apr 2017 13:16:39 +0200 |
From: Danil Antonov <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-pci-bus.c | 16 ++++++++++------
hw/s390x/s390-pci-inst.c | 16 ++++++++++------
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 69b0291e8a..0f62363434 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -24,14 +24,18 @@
#include "qemu/error-report.h"
/* #define DEBUG_S390PCI_BUS */
-#ifdef DEBUG_S390PCI_BUS
-#define DPRINTF(fmt, ...) \
- do { fprintf(stderr, "S390pci-bus: " fmt, ## __VA_ARGS__); } while (0)
-#else
-#define DPRINTF(fmt, ...) \
- do { } while (0)
+
+#ifndef DEBUG_S390PCI_BUS
+#define DEBUG_S390PCI_BUS 0
#endif
+#define DPRINTF(fmt, ...) \
+ do { \
+ if (DEBUG_S390PCI_BUS) { \
+ fprintf(stderr, "S390pci-bus: " fmt, ## __VA_ARGS__); \
+ } \
+ } while (0)
+
S390pciState *s390_get_phb(void)
{
static S390pciState *phb;
diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
index d2a8c0a083..763eebd67f 100644
--- a/hw/s390x/s390-pci-inst.c
+++ b/hw/s390x/s390-pci-inst.c
@@ -21,14 +21,18 @@
#include "sysemu/hw_accel.h"
/* #define DEBUG_S390PCI_INST */
-#ifdef DEBUG_S390PCI_INST
-#define DPRINTF(fmt, ...) \
- do { fprintf(stderr, "s390pci-inst: " fmt, ## __VA_ARGS__); } while (0)
-#else
-#define DPRINTF(fmt, ...) \
- do { } while (0)
+
+#ifndef DEBUG_S390PCI_INST
+#define DEBUG_S390PCI_INST 0
#endif
+#define DPRINTF(fmt, ...) \
+ do { \
+ if (DEBUG_S390PCI_INST) { \
+ fprintf(stderr, "s390pci-inst: " fmt, ## __VA_ARGS__); \
+ } \
+ } while (0)
+
static void s390_set_status_code(CPUS390XState *env,
uint8_t r, uint64_t status_code)
{
--
2.11.0
- [Qemu-devel] [PATCH for-2.10 00/10] s390x queue for 2.10, Cornelia Huck, 2017/04/06
- [Qemu-devel] [PATCH for-2.10 01/10] s390x: introduce 2.10 compat machine, Cornelia Huck, 2017/04/06
- [Qemu-devel] [PATCH for-2.10 03/10] s390x/pci: make printf always compile in debug output,
Cornelia Huck <=
- [Qemu-devel] [PATCH for-2.10 02/10] s390x/kvm: make printf always compile in debug output, Cornelia Huck, 2017/04/06
- [Qemu-devel] [PATCH for-2.10 04/10] s390x/css: introduce read-only property type for device ids, Cornelia Huck, 2017/04/06
- [Qemu-devel] [PATCH for-2.10 05/10] s390x/css: provide introspection for virtual subchannel and device busid, Cornelia Huck, 2017/04/06
- [Qemu-devel] [PATCH for-2.10 07/10] s390x: use enum for adapter type and standardize its naming, Cornelia Huck, 2017/04/06
- [Qemu-devel] [PATCH for-2.10 08/10] s390x: initialize flic before I/O subsystems, Cornelia Huck, 2017/04/06
- [Qemu-devel] [PATCH for-2.10 06/10] s390x/css: consolidate the devno property for ccw devices, Cornelia Huck, 2017/04/06