| Message ID | 1399964572-5376-12-git-send-email-marc.mari.barcelo@gmail.com |
|---|---|
| State | New |
| Headers | show |
El Tue, 13 May 2014 09:02:47 +0200 Marc Marí <marc.mari.barcelo@gmail.com> escribió: > hw/dma/rc4030.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c > index af26632..84f9f33 100644 > --- a/hw/dma/rc4030.c > +++ b/hw/dma/rc4030.c > @@ -32,17 +32,16 @@ > //#define DEBUG_RC4030 > //#define DEBUG_RC4030_DMA > > -#ifdef DEBUG_RC4030 > -#define DPRINTF(fmt, ...) \ > -do { printf("rc4030: " fmt , ## __VA_ARGS__); } while (0) > static const char* irq_names[] = { "parallel", "floppy", "sound", > "video", "network", "scsi", "keyboard", "mouse", "serial0", > "serial1" }; +#ifdef DEBUG_RC4030 > +#define DEBUG_RC4030_ENABLED 1 > #else > -#define DPRINTF(fmt, ...) > +#define DEBUG_RC4030_ENABLED 0 > #endif > > -#define RC4030_ERROR(fmt, ...) \ > -do { fprintf(stderr, "rc4030 ERROR: %s: " fmt, __func__ , ## > __VA_ARGS__); } while (0) +#define DPRINTF(fmt, ...) > QEMU_DPRINTF(DEBUG_RC4030_ENABLED, "rc4030", fmt, ## __VA_ARGS__) > +#define RC4030_ERROR(fmt, ...) QEMU_DPRINTF(1, "rc4030 ERROR", fmt, > ## > __VA_ARGS__) /********************************************************/ /* > rc4030 emulation */ This file debugs to stdout. Modifying it was a misreading. printfs in the code can be changed to fprintfs to stderr or the macro can be left as it was. Marc
diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index af26632..84f9f33 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -32,17 +32,16 @@ //#define DEBUG_RC4030 //#define DEBUG_RC4030_DMA -#ifdef DEBUG_RC4030 -#define DPRINTF(fmt, ...) \ -do { printf("rc4030: " fmt , ## __VA_ARGS__); } while (0) static const char* irq_names[] = { "parallel", "floppy", "sound", "video", "network", "scsi", "keyboard", "mouse", "serial0", "serial1" }; +#ifdef DEBUG_RC4030 +#define DEBUG_RC4030_ENABLED 1 #else -#define DPRINTF(fmt, ...) +#define DEBUG_RC4030_ENABLED 0 #endif -#define RC4030_ERROR(fmt, ...) \ -do { fprintf(stderr, "rc4030 ERROR: %s: " fmt, __func__ , ## __VA_ARGS__); } while (0) +#define DPRINTF(fmt, ...) QEMU_DPRINTF(DEBUG_RC4030_ENABLED, "rc4030", fmt, ## __VA_ARGS__) +#define RC4030_ERROR(fmt, ...) QEMU_DPRINTF(1, "rc4030 ERROR", fmt, ## __VA_ARGS__) /********************************************************/ /* rc4030 emulation */
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/rc4030.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)