[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 for-3.2 v2 19/30] slirp: always build with debug
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 for-3.2 v2 19/30] slirp: always build with debug statements |
Date: |
Thu, 22 Nov 2018 02:06:36 +0400 |
Make debug statements condiitonal only on slirp_debug flags, instead
of the pre-processor DEBUG blocks, as it may introduce breakage
easily, since the debug code isn't always compiled.
Signed-off-by: Marc-André Lureau <address@hidden>
---
slirp/debug.h | 15 +++------------
slirp/misc.c | 6 +++++-
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/slirp/debug.h b/slirp/debug.h
index ca3a4b04da..ff920f0b87 100644
--- a/slirp/debug.h
+++ b/slirp/debug.h
@@ -5,9 +5,8 @@
* terms and conditions of the copyright.
*/
-//#define DEBUG 1
-
-#ifdef DEBUG
+#ifndef DEBUG_H_
+#define DEBUG_H_
#define DBG_CALL 0x1
#define DBG_MISC 0x2
@@ -50,12 +49,4 @@ extern int slirp_debug;
} \
} while (0)
-#else
-
-#define DEBUG_CALL(fmt, ...)
-#define DEBUG_ARG(fmt, ...)
-#define DEBUG_ARGS(fmt, ...)
-#define DEBUG_MISC(fmt, ...)
-#define DEBUG_ERROR(fmt, ...)
-
-#endif
+#endif /* DEBUG_H_ */
diff --git a/slirp/misc.c b/slirp/misc.c
index 6ee0ff0231..0b7ec89595 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -12,9 +12,13 @@
#include "qemu/main-loop.h"
#ifdef DEBUG
-int slirp_debug = DBG_CALL|DBG_MISC|DBG_ERROR;
+#define SLIRP_DEBUG (DBG_CALL | DBG_MISC | DBG_ERROR)
+#else
+#define SLIRP_DEBUG 0
#endif
+int slirp_debug = SLIRP_DEBUG;
+
inline void
insque(void *a, void *b)
{
--
2.20.0.rc1
- [Qemu-devel] [PATCH v2 for-3.2 v2 13/30] build-sys: use a seperate slirp-obj-y && slirp.mo, (continued)
- [Qemu-devel] [PATCH v2 for-3.2 v2 13/30] build-sys: use a seperate slirp-obj-y && slirp.mo, Marc-André Lureau, 2018/11/21
- [Qemu-devel] [PATCH v2 for-3.2 v2 14/30] slirp: set G_LOG_DOMAIN, Marc-André Lureau, 2018/11/21
- [Qemu-devel] [PATCH v2 for-3.2 v2 15/30] slirp: replace error_report() and a fprintf with g_critical(), Marc-André Lureau, 2018/11/21
- [Qemu-devel] [PATCH v2 for-3.2 v2 16/30] slirp: replace some fprintf() with DEBUG_MISC, Marc-André Lureau, 2018/11/21
- [Qemu-devel] [PATCH v2 for-3.2 v2 17/30] slirp: replace a DEBUG block with WITH_ICMP_ERROR_MSG, Marc-André Lureau, 2018/11/21
- [Qemu-devel] [PATCH v2 for-3.2 v2 18/30] slirp: no need to make DPRINTF conditional on DEBUG, Marc-André Lureau, 2018/11/21
- [Qemu-devel] [PATCH v2 for-3.2 v2 19/30] slirp: always build with debug statements,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 for-3.2 v2 20/30] slirp: introduce SLIRP_DEBUG environment variable, Marc-André Lureau, 2018/11/21
- [Qemu-devel] [PATCH v2 for-3.2 v2 22/30] slirp: remove remaining DEBUG blocks, Marc-André Lureau, 2018/11/21
- [Qemu-devel] [PATCH v2 for-3.2 v2 23/30] slirp: replace DEBUG_ARGS with DEBUG_ARG, Marc-André Lureau, 2018/11/21
- [Qemu-devel] [PATCH v2 for-3.2 v2 21/30] slirp: use %p for pointers format, Marc-André Lureau, 2018/11/21
- [Qemu-devel] [PATCH v2 for-3.2 v2 25/30] slirp: replace trace functions with DEBUG calls, Marc-André Lureau, 2018/11/21