From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lW-00045a-BA for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wk6lL-00012y-Rx for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:42 -0400 Received: from mail-we0-x22c.google.com ([2a00:1450:400c:c03::22c]:52248) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lL-00012k-Lj for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:31 -0400 Received: by mail-we0-f172.google.com with SMTP id k48so7988718wev.3 for ; Tue, 13 May 2014 00:04:30 -0700 (PDT) From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Tue, 13 May 2014 09:02:41 +0200 Message-Id: <1399964572-5376-6-git-send-email-marc.mari.barcelo@gmail.com> In-Reply-To: <1399964572-5376-1-git-send-email-marc.mari.barcelo@gmail.com> References: <1399964572-5376-1-git-send-email-marc.mari.barcelo@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [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: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc=20Mar=C3=AD?= , Stefan Hajnoczi , Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= 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í --- 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 */ -- 1.7.10.4