Modify debug macros to have the same format through the codebase and use regular ifs instead of ifdef.
As the debug printf is always put in code, some casting had to be added to avoid warnings treated as errors at compile time. Signed-off-by: Marc Marí <marc.mari.barc...@gmail.com> --- hw/net/cadence_gem.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index cdb1825..aa93372 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -28,15 +28,16 @@ #include "net/net.h" #include "net/checksum.h" +//#define CADENCE_GEM_ERR_DEBUG + #ifdef CADENCE_GEM_ERR_DEBUG -#define DB_PRINT(...) do { \ - fprintf(stderr, ": %s: ", __func__); \ - fprintf(stderr, ## __VA_ARGS__); \ - } while (0); +#define CADENCE_GEM_ERR_DEBUG_ENABLED 1 #else - #define DB_PRINT(...) +#define CADENCE_GEM_ERR_DEBUG_ENABLED 0 #endif +#define DB_PRINT(...) QEMU_DPRINTF(CADENCE_GEM_ERR_DEBUG_ENABLED, "cadence_gem", __VA_ARGS__) + #define GEM_NWCTRL (0x00000000/4) /* Network Control reg */ #define GEM_NWCFG (0x00000004/4) /* Network Config reg */ #define GEM_NWSTATUS (0x00000008/4) /* Network Status reg */ -- 1.7.10.4