From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lc-0004Ji-JB 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 1Wk6lT-00014e-Db for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:48 -0400 Received: from mail-wg0-x230.google.com ([2a00:1450:400c:c00::230]:35451) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lT-00014Y-4F for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:39 -0400 Received: by mail-wg0-f48.google.com with SMTP id b13so7777485wgh.31 for ; Tue, 13 May 2014 00:04:38 -0700 (PDT) From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Tue, 13 May 2014 09:02:46 +0200 Message-Id: <1399964572-5376-11-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 10/16] i8257: 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/i8257.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index 4490372..22cb2bf 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -27,15 +27,16 @@ /* #define DEBUG_DMA */ -#define dolog(...) fprintf (stderr, "dma: " __VA_ARGS__) #ifdef DEBUG_DMA -#define linfo(...) fprintf (stderr, "dma: " __VA_ARGS__) -#define ldebug(...) fprintf (stderr, "dma: " __VA_ARGS__) +#define DEBUG_DMA_ENABLED 1 #else -#define linfo(...) -#define ldebug(...) +#define DEBUG_DMA_ENABLED 0 #endif +#define dolog(...) QEMU_DPRINTF(1, "dma", __VA_ARGS__) +#define linfo(...) QEMU_DPRINTF(DEBUG_DMA_ENABLED, "dma", __VA_ARGS__); +#define ldebug linfo + struct dma_regs { int now[2]; uint16_t base[2]; @@ -301,7 +302,7 @@ static uint64_t read_cont(void *opaque, hwaddr nport, unsigned size) break; } - ldebug ("read_cont: nport %#06x, iport %#04x val %#x\n", nport, iport, val); + ldebug ("read_cont: nport %#06x, iport %#04x val %#x\n", (unsigned)nport, iport, val); return val; } -- 1.7.10.4