From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk9V3-0007F5-Uc for qemu-devel@nongnu.org; Tue, 13 May 2014 06:00:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wk9Uu-0006Wq-Sm for qemu-devel@nongnu.org; Tue, 13 May 2014 05:59:53 -0400 Received: from mail-wg0-x232.google.com ([2a00:1450:400c:c00::232]:46281) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk9Uu-0006Wl-MF for qemu-devel@nongnu.org; Tue, 13 May 2014 05:59:44 -0400 Received: by mail-wg0-f50.google.com with SMTP id x12so118324wgg.9 for ; Tue, 13 May 2014 02:59:43 -0700 (PDT) Date: Tue, 13 May 2014 11:59:38 +0200 From: Marc =?UTF-8?B?TWFyw60=?= Message-ID: <20140513115938.033f45d7@crunchbang> In-Reply-To: <1399964572-5376-6-git-send-email-marc.mari.barcelo@gmail.com> References: <1399964572-5376-1-git-send-email-marc.mari.barcelo@gmail.com> <1399964572-5376-6-git-send-email-marc.mari.barcelo@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 05/16] xilinx: Convert conditional compilation of debug printfs to regular ifs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marc =?UTF-8?B?TWFyw60=?= Cc: Stefan Hajnoczi , Peter Crosthwaite , qemu-devel@nongnu.org, Andreas =?UTF-8?B?RsOkcmJlcg==?= El Tue, 13 May 2014 09:02:41 +0200 Marc Mar=C3=AD escribi=C3=B3: > Modify debug macros to have the same format through the codebase and > use regular ifs instead of ifdef. >=20 > As the debug printf is always put in code, some casting had to be > added to avoid warnings treated as errors at compile time. >=20 > Signed-off-by: Marc Mar=C3=AD > --- > hw/net/cadence_gem.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) >=20 > 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" > =20 > +//#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 > =20 > +#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