[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/11] s390x/pci: make printf always compile in debug
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 03/11] s390x/pci: make printf always compile in debug output |
Date: |
Fri, 21 Apr 2017 09:40:30 +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>
[CH: remove now misleading comments]
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-pci-bus.c | 16 +++++++++-------
hw/s390x/s390-pci-inst.c | 16 +++++++++-------
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 69b0291e8a..1570f2d12a 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -23,15 +23,17 @@
#include "hw/pci/msi.h"
#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..f520ce105f 100644
--- a/hw/s390x/s390-pci-inst.c
+++ b/hw/s390x/s390-pci-inst.c
@@ -20,15 +20,17 @@
#include "qemu/error-report.h"
#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] [PULL 00/11] s390x patches for 2.10, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 01/11] s390x: introduce 2.10 compat machine, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 02/11] s390x/kvm: make printf always compile in debug output, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 03/11] s390x/pci: make printf always compile in debug output,
Cornelia Huck <=
- [Qemu-devel] [PULL 07/11] s390x: use enum for adapter type and standardize its naming, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 04/11] s390x/css: introduce read-only property type for device ids, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 06/11] s390x/css: consolidate the devno property for ccw devices, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 10/11] s390x: register I/O adapters per ISC during init, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 05/11] s390x/css: provide introspection for virtual subchannel and device busid, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 08/11] s390x: initialize flic before I/O subsystems, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 09/11] s390x/flic: cache flic in s390_get_flic, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 11/11] s390x: Drop useless casts, Cornelia Huck, 2017/04/21
- Re: [Qemu-devel] [PULL 00/11] s390x patches for 2.10, Peter Maydell, 2017/04/21