El Tue, 13 May 2014 09:02:41 +0200 Marc Marí <marc.mari.barc...@gmail.com> escribió: > 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 */
I saw that later in that file there are some DB_PRINT that do not add a \n at the end (for example in L.1128). This can either be solved by using fprintfs in between a #if CADENCE_GEM_ERR_DEBUG_ENABLED, adding a \n after the message or leave the macro as it was. Marc