From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lX-00049I-Vg for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wk6lO-00013a-UM for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:43 -0400 Received: from mail-we0-x236.google.com ([2a00:1450:400c:c03::236]:33319) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lO-00013Q-Om for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:34 -0400 Received: by mail-we0-f182.google.com with SMTP id t60so8054272wes.27 for ; Tue, 13 May 2014 00:04:34 -0700 (PDT) From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Tue, 13 May 2014 09:02:43 +0200 Message-Id: <1399964572-5376-8-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 07/16] stellaris: 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/stellaris_enet.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index d04e6a4..f6737a9 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -13,16 +13,17 @@ //#define DEBUG_STELLARIS_ENET 1 #ifdef DEBUG_STELLARIS_ENET -#define DPRINTF(fmt, ...) \ -do { printf("stellaris_enet: " fmt , ## __VA_ARGS__); } while (0) -#define BADF(fmt, ...) \ -do { fprintf(stderr, "stellaris_enet: error: " fmt , ## __VA_ARGS__); exit(1);} while (0) +#define DEBUG_STELLARIS_ENET_ENABLED 1 #else -#define DPRINTF(fmt, ...) do {} while(0) -#define BADF(fmt, ...) \ -do { fprintf(stderr, "stellaris_enet: error: " fmt , ## __VA_ARGS__);} while (0) +#define DEBUG_STELLARIS_ENET_ENABLED 0 #endif +#define DPRINTF(fmt, ...) QEMU_DPRINTF(DEBUG_STELLARIS_ENET_ENABLED, "stellaris_enet", fmt, ## __VA_ARGS__) + +#define BADF(fmt, ...) \ + QEMU_DPRINTF(1, "stellaris_enet error", fmt, ## __VA_ARGS__); \ + do { if (DEBUG_STELLARIS_ENET_ENABLED) { exit(1); } } while (0) + #define SE_INT_RX 0x01 #define SE_INT_TXER 0x02 #define SE_INT_TXEMP 0x04 @@ -97,7 +98,7 @@ static ssize_t stellaris_enet_receive(NetClientState *nc, const uint8_t *buf, si return -1; } - DPRINTF("Received packet len=%d\n", size); + DPRINTF("Received packet len=%d\n", (int)size); n = s->next_packet + s->np; if (n >= 31) n -= 31; @@ -212,14 +213,14 @@ static void stellaris_enet_write(void *opaque, hwaddr offset, switch (offset) { case 0x00: /* IACK */ s->ris &= ~value; - DPRINTF("IRQ ack %02x/%02x\n", value, s->ris); + DPRINTF("IRQ ack %02x/%02x\n", (unsigned)value, s->ris); stellaris_enet_update(s); /* Clearing TXER also resets the TX fifo. */ if (value & SE_INT_TXER) s->tx_frame_len = -1; break; case 0x04: /* IM */ - DPRINTF("IRQ mask %02x/%02x\n", value, s->ris); + DPRINTF("IRQ mask %02x/%02x\n", (unsigned)value, s->ris); s->im = value; stellaris_enet_update(s); break; -- 1.7.10.4