From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wlnew-0006dV-1t 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 1Wlnen-00045G-1T for qemu-devel@nongnu.org; Sat, 17 May 2014 19:04:53 -0400 Received: from mail-wg0-x22c.google.com ([2a00:1450:400c:c00::22c]:50155) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wlnem-00044x-S8 for qemu-devel@nongnu.org; Sat, 17 May 2014 19:04:44 -0400 Received: by mail-wg0-f44.google.com with SMTP id a1so6275253wgh.15 for ; Sat, 17 May 2014 16:04:44 -0700 (PDT) From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Sun, 18 May 2014 01:03:37 +0200 Message-Id: <1400367823-32610-11-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 10/16] i8257: 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. As the debug printf is always put in code, some formats had to be changed to avoid warnings treated as errors at compile time. Signed-off-by: Marc Marí --- hw/dma/i8257.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index 4490372..b4e0535 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,8 @@ 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 %#06" PRIx64 ", iport %#04x val %#x\n", + nport, iport, val); return val; } -- 1.7.10.4