slirp: always build with debug statements

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 <marcandre.lureau@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Marc-André Lureau 2018-11-22 02:06:36 +04:00 committed by Samuel Thibault
parent c2b3350b67
commit 208408c3ed
2 changed files with 8 additions and 13 deletions

View File

@ -5,9 +5,8 @@
* terms and conditions of the copyright. * terms and conditions of the copyright.
*/ */
//#define DEBUG 1 #ifndef DEBUG_H_
#define DEBUG_H_
#ifdef DEBUG
#define DBG_CALL 0x1 #define DBG_CALL 0x1
#define DBG_MISC 0x2 #define DBG_MISC 0x2
@ -50,12 +49,4 @@ extern int slirp_debug;
} \ } \
} while (0) } while (0)
#else #endif /* DEBUG_H_ */
#define DEBUG_CALL(fmt, ...)
#define DEBUG_ARG(fmt, ...)
#define DEBUG_ARGS(fmt, ...)
#define DEBUG_MISC(fmt, ...)
#define DEBUG_ERROR(fmt, ...)
#endif

View File

@ -12,9 +12,13 @@
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#ifdef DEBUG #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 #endif
int slirp_debug = SLIRP_DEBUG;
inline void inline void
insque(void *a, void *b) insque(void *a, void *b)
{ {