| Message ID | 1399964572-5376-10-git-send-email-marc.mari.barcelo@gmail.com |
|---|---|
| State | New |
| Headers | show |
El Tue, 13 May 2014 09:02:45 +0200 Marc Marí <marc.mari.barcelo@gmail.com> escribió: > hw/dma/i82374.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c > index b8ad2e6..7026f24 100644 > --- a/hw/dma/i82374.c > +++ b/hw/dma/i82374.c > @@ -27,14 +27,13 @@ > //#define DEBUG_I82374 > > #ifdef DEBUG_I82374 > -#define DPRINTF(fmt, ...) \ > -do { fprintf(stderr, "i82374: " fmt , ## __VA_ARGS__); } while (0) > +#define DEBUG_I82374_ENABLED 1 > #else > -#define DPRINTF(fmt, ...) \ > -do {} while (0) > +#define DEBUG_I82374_ENABLED 0 > #endif > -#define BADF(fmt, ...) \ > -do { fprintf(stderr, "i82374 ERROR: " fmt , ## __VA_ARGS__); } while > (0) + > +#define DPRINTF(fmt, ...) QEMU_DPRINTF(DEBUG_I82374_ENABLED, > "i82374", fmt, ## __VA_ARGS__) +#define BADF(fmt, ...) > QEMU_DPRINTF(1, "i82374 ERROR", fmt, ## __VA_ARGS__) > typedef struct I82374State { > uint8_t commands[8]; In this file, the function name is already written when the macros are called, so now it will appear two times. The calls to the macro can be changed to not add the function name, which, in my opinion, is a bit nicer. Marc
diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index b8ad2e6..7026f24 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -27,14 +27,13 @@ //#define DEBUG_I82374 #ifdef DEBUG_I82374 -#define DPRINTF(fmt, ...) \ -do { fprintf(stderr, "i82374: " fmt , ## __VA_ARGS__); } while (0) +#define DEBUG_I82374_ENABLED 1 #else -#define DPRINTF(fmt, ...) \ -do {} while (0) +#define DEBUG_I82374_ENABLED 0 #endif -#define BADF(fmt, ...) \ -do { fprintf(stderr, "i82374 ERROR: " fmt , ## __VA_ARGS__); } while (0) + +#define DPRINTF(fmt, ...) QEMU_DPRINTF(DEBUG_I82374_ENABLED, "i82374", fmt, ## __VA_ARGS__) +#define BADF(fmt, ...) QEMU_DPRINTF(1, "i82374 ERROR", fmt, ## __VA_ARGS__) typedef struct I82374State { uint8_t commands[8];
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.barcelo@gmail.com> --- hw/dma/i82374.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)