From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wlnep-0006Sg-0F for qemu-devel@nongnu.org; Sat, 17 May 2014 19:04:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wlneg-00043Y-0O for qemu-devel@nongnu.org; Sat, 17 May 2014 19:04:46 -0400 Received: from mail-wi0-x229.google.com ([2a00:1450:400c:c05::229]:55033) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wlnef-00043L-Q6 for qemu-devel@nongnu.org; Sat, 17 May 2014 19:04:37 -0400 Received: by mail-wi0-f169.google.com with SMTP id hi2so3663872wib.4 for ; Sat, 17 May 2014 16:04:37 -0700 (PDT) From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Sun, 18 May 2014 01:03:33 +0200 Message-Id: <1400367823-32610-7-git-send-email-marc.mari.barcelo@gmail.com> In-Reply-To: <1400367823-32610-1-git-send-email-marc.mari.barcelo@gmail.com> References: <1400367823-32610-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 v3 06/16] xilinx: Convert debug printfs to QEMU_DPRINTF 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 QEMU_DPRINTF adds a header to the message, when the message is not in a new line, printf has to be used. Signed-off-by: Marc Marí --- hw/net/cadence_gem.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 47e7038..32e940b 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -28,15 +28,17 @@ #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 */ @@ -1195,7 +1197,9 @@ static void gem_write(void *opaque, hwaddr offset, uint64_t val, break; } - DB_PRINT("newval: 0x%08x\n", s->regs[offset]); + if(CADENCE_GEM_ERR_DEBUG_ENABLED) { + fprintf(stderr, "newval: 0x%08x\n", s->regs[offset]); + } } static const MemoryRegionOps gem_ops = { @@ -1208,13 +1212,17 @@ static void gem_cleanup(NetClientState *nc) { GemState *s = qemu_get_nic_opaque(nc); - DB_PRINT("\n"); + if(CADENCE_GEM_ERR_DEBUG_ENABLED) { + fprintf(stderr, "\n"); + } s->nic = NULL; } static void gem_set_link(NetClientState *nc) { - DB_PRINT("\n"); + if(CADENCE_GEM_ERR_DEBUG_ENABLED) { + fprintf(stderr, "\n"); + } phy_update_link(qemu_get_nic_opaque(nc)); } -- 1.7.10.4