From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lb-0004GY-0a for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wk6lS-00014P-0v for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:46 -0400 Received: from mail-wi0-x232.google.com ([2a00:1450:400c:c05::232]:55472) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lR-00014H-P3 for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:37 -0400 Received: by mail-wi0-f178.google.com with SMTP id hm4so54921wib.11 for ; Tue, 13 May 2014 00:04:37 -0700 (PDT) From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Tue, 13 May 2014 09:02:45 +0200 Message-Id: <1399964572-5376-10-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 09/16] i82374: 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/i82374.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index b8ad2e6..7026f24 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -27,14 +27,13 @@ //#define DEBUG_I82374 #ifdef DEBUG_I82374 -#define DPRINTF(fmt, ...) \ -do { fprintf(stderr, "i82374: " fmt , ## __VA_ARGS__); } while (0) +#define DEBUG_I82374_ENABLED 1 #else -#define DPRINTF(fmt, ...) \ -do {} while (0) +#define DEBUG_I82374_ENABLED 0 #endif -#define BADF(fmt, ...) \ -do { fprintf(stderr, "i82374 ERROR: " fmt , ## __VA_ARGS__); } while (0) + +#define DPRINTF(fmt, ...) QEMU_DPRINTF(DEBUG_I82374_ENABLED, "i82374", fmt, ## __VA_ARGS__) +#define BADF(fmt, ...) QEMU_DPRINTF(1, "i82374 ERROR", fmt, ## __VA_ARGS__) typedef struct I82374State { uint8_t commands[8]; -- 1.7.10.4