diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2018-11-22 02:06:36 +0400 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-01-14 00:44:29 +0100 |
| commit | 208408c3ed3f02ca97598f90319a2c5760271454 (patch) | |
| tree | 726616465603fe1533ce2ab8a9a28e8c0baaf593 /slirp | |
| parent | c2b3350b67e71d16894d66238e8b55f5e521bd99 (diff) | |
| download | qemu-208408c3ed3f02ca97598f90319a2c5760271454.zip qemu-208408c3ed3f02ca97598f90319a2c5760271454.tar.gz qemu-208408c3ed3f02ca97598f90319a2c5760271454.tar.bz2 | |
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>
Diffstat (limited to 'slirp')
| -rw-r--r-- | slirp/debug.h | 15 | ||||
| -rw-r--r-- | slirp/misc.c | 6 |
2 files changed, 8 insertions, 13 deletions
diff --git a/slirp/debug.h b/slirp/debug.h index ca3a4b0..ff920f0 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 526cefa..e30d2ce 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) { |