From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6le-0004MC-0t for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wk6lU-000151-Mx for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:49 -0400 Received: from mail-wg0-x22c.google.com ([2a00:1450:400c:c00::22c]:35922) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lU-00014q-Ga for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:40 -0400 Received: by mail-wg0-f44.google.com with SMTP id a1so7958375wgh.27 for ; Tue, 13 May 2014 00:04:39 -0700 (PDT) From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Tue, 13 May 2014 09:02:47 +0200 Message-Id: <1399964572-5376-12-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 11/16] rc4030: 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/dma/rc4030.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index af26632..84f9f33 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -32,17 +32,16 @@ //#define DEBUG_RC4030 //#define DEBUG_RC4030_DMA -#ifdef DEBUG_RC4030 -#define DPRINTF(fmt, ...) \ -do { printf("rc4030: " fmt , ## __VA_ARGS__); } while (0) static const char* irq_names[] = { "parallel", "floppy", "sound", "video", "network", "scsi", "keyboard", "mouse", "serial0", "serial1" }; +#ifdef DEBUG_RC4030 +#define DEBUG_RC4030_ENABLED 1 #else -#define DPRINTF(fmt, ...) +#define DEBUG_RC4030_ENABLED 0 #endif -#define RC4030_ERROR(fmt, ...) \ -do { fprintf(stderr, "rc4030 ERROR: %s: " fmt, __func__ , ## __VA_ARGS__); } while (0) +#define DPRINTF(fmt, ...) QEMU_DPRINTF(DEBUG_RC4030_ENABLED, "rc4030", fmt, ## __VA_ARGS__) +#define RC4030_ERROR(fmt, ...) QEMU_DPRINTF(1, "rc4030 ERROR", fmt, ## __VA_ARGS__) /********************************************************/ /* rc4030 emulation */ -- 1.7.10.4