Modify debug macros to have the same format through the codebase and use regular ifs instead of ifdef.
Signed-off-by: Marc Marí <marc.mari.barc...@gmail.com> --- hw/net/stellaris_enet.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index c9ee5d3..ea2b150 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -13,16 +13,23 @@ //#define DEBUG_STELLARIS_ENET 1 #ifdef DEBUG_STELLARIS_ENET -#define DPRINTF(fmt, ...) \ -do { printf("stellaris_enet: " fmt , ## __VA_ARGS__); } while (0) -#define BADF(fmt, ...) \ -do { fprintf(stderr, "stellaris_enet: error: " fmt , ## __VA_ARGS__); exit(1);} while (0) +#define DEBUG_STELLARIS_ENET_ENABLED 1 #else -#define DPRINTF(fmt, ...) do {} while(0) -#define BADF(fmt, ...) \ -do { fprintf(stderr, "stellaris_enet: error: " fmt , ## __VA_ARGS__);} while (0) +#define DEBUG_STELLARIS_ENET_ENABLED 0 #endif +#define DPRINTF(fmt, ...) \ + QEMU_DPRINTF(DEBUG_STELLARIS_ENET_ENABLED, \ + "stellaris_enet", fmt, ## __VA_ARGS__) + +#define BADF(fmt, ...) \ + do { \ + QEMU_DPRINTF(1, "stellaris_enet error", fmt, ## __VA_ARGS__); \ + if (DEBUG_STELLARIS_ENET_ENABLED) { \ + exit(1); \ + }\ + } while (0) + #define SE_INT_RX 0x01 #define SE_INT_TXER 0x02 #define SE_INT_TXEMP 0x04 -- 1.7.10.4