From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wlneu-0006Zg-3J for qemu-devel@nongnu.org; Sat, 17 May 2014 19:05:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wlnej-00044Q-TS for qemu-devel@nongnu.org; Sat, 17 May 2014 19:04:52 -0400 Received: from mail-wi0-x22e.google.com ([2a00:1450:400c:c05::22e]:56072) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wlnej-00044G-MN for qemu-devel@nongnu.org; Sat, 17 May 2014 19:04:41 -0400 Received: by mail-wi0-f174.google.com with SMTP id r20so2514755wiv.1 for ; Sat, 17 May 2014 16:04:40 -0700 (PDT) From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Sun, 18 May 2014 01:03:35 +0200 Message-Id: <1400367823-32610-9-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 08/16] stellaris: 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. Signed-off-by: Marc Marí --- hw/net/stellaris_enet.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index c9ee5d3..ea2b150 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -13,16 +13,23 @@ //#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, ...) \ + do { \ + QEMU_DPRINTF(1, "stellaris_enet error", fmt, ## __VA_ARGS__); \ + if (DEBUG_STELLARIS_ENET_ENABLED) { \ + exit(1); \ + }\ + } while (0) + #define SE_INT_RX 0x01 #define SE_INT_TXER 0x02 #define SE_INT_TXEMP 0x04 -- 1.7.10.4