From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lh-0004SE-0V for qemu-devel@nongnu.org; Tue, 13 May 2014 03:05:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wk6lX-000164-Rl for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:52 -0400 Received: from mail-wg0-x229.google.com ([2a00:1450:400c:c00::229]:56823) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lX-00015u-Ld for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:43 -0400 Received: by mail-wg0-f41.google.com with SMTP id z12so8044637wgg.24 for ; Tue, 13 May 2014 00:04:42 -0700 (PDT) From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Tue, 13 May 2014 09:02:49 +0200 Message-Id: <1399964572-5376-14-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 13/16] isa: 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/isa/vt82c686.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 1a93afd..5184e4b 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -29,11 +29,13 @@ //#define DEBUG_VT82C686B #ifdef DEBUG_VT82C686B -#define DPRINTF(fmt, ...) fprintf(stderr, "%s: " fmt, __FUNCTION__, ##__VA_ARGS__) +#define DEBUG_VT82C686B_ENABLED 1 #else -#define DPRINTF(fmt, ...) +#define DEBUG_VT82C686B_ENABLED 0 #endif +#define DPRINTF(fmt, ...) QEMU_DPRINTF(DEBUG_VT82C686B_ENABLED, "vt82c686", fmt, ## __VA_ARGS__) + typedef struct SuperIOConfig { uint8_t config[0xff]; @@ -53,7 +55,7 @@ static void superio_ioport_writeb(void *opaque, hwaddr addr, uint64_t data, int can_write; SuperIOConfig *superio_conf = opaque; - DPRINTF("superio_ioport_writeb address 0x%x val 0x%x\n", addr, data); + DPRINTF("superio_ioport_writeb address 0x%x val 0x%x\n", (unsigned)addr, (unsigned)data); if (addr == 0x3f0) { superio_conf->index = data & 0xff; } else { @@ -99,7 +101,7 @@ static uint64_t superio_ioport_readb(void *opaque, hwaddr addr, unsigned size) { SuperIOConfig *superio_conf = opaque; - DPRINTF("superio_ioport_readb address 0x%x\n", addr); + DPRINTF("superio_ioport_readb address 0x%x\n", (unsigned)addr); return (superio_conf->config[superio_conf->index]); } -- 1.7.10.4