From patchwork Thu Aug 23 06:24:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Ogilvie X-Patchwork-Id: 179512 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 438D92C00A2 for ; Thu, 23 Aug 2012 16:25:33 +1000 (EST) Received: from localhost ([::1]:34726 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4QrC-0004Z6-6s for incoming@patchwork.ozlabs.org; Thu, 23 Aug 2012 02:25:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4Qr4-0004Yn-Na for qemu-devel@nongnu.org; Thu, 23 Aug 2012 02:25:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T4Qr0-0003y2-8K for qemu-devel@nongnu.org; Thu, 23 Aug 2012 02:25:22 -0400 Received: from qmta01.emeryville.ca.mail.comcast.net ([76.96.30.16]:43846) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4Qqz-0003qM-W9 for qemu-devel@nongnu.org; Thu, 23 Aug 2012 02:25:18 -0400 Received: from omta17.emeryville.ca.mail.comcast.net ([76.96.30.73]) by qmta01.emeryville.ca.mail.comcast.net with comcast id q6131j00D1afHeLA16RHT9; Thu, 23 Aug 2012 06:25:17 +0000 Received: from mmogilvi.homeip.net ([24.9.53.136]) by omta17.emeryville.ca.mail.comcast.net with comcast id q6RG1j00F2wKXRC8d6RHds; Thu, 23 Aug 2012 06:25:17 +0000 Received: by mmogilvi.homeip.net (Postfix, from userid 501) id 76EC91E9601A; Thu, 23 Aug 2012 00:25:16 -0600 (MDT) From: Matthew Ogilvie To: qemu-devel@nongnu.org Date: Thu, 23 Aug 2012 00:24:38 -0600 Message-Id: <1345703083-25322-2-git-send-email-mmogilvi_qemu@miniinfo.net> X-Mailer: git-send-email 1.7.10.2.484.gcd07cc5 In-Reply-To: <1345703083-25322-1-git-send-email-mmogilvi_qemu@miniinfo.net> References: <1345703083-25322-1-git-send-email-mmogilvi_qemu@miniinfo.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 76.96.30.16 Cc: Matthew Ogilvie Subject: [Qemu-devel] [PATCH v2 1/6] fix some debug printf format strings X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org These are normally ifdefed out and don't matter. But if you enable them, they ought to be correct. Signed-off-by: Matthew Ogilvie --- This version of the patch adds i8259.c. An alternative approach might be to eliminate these printf's, and/or replace them with trace*() calls, but until someone gets around to doing so... hw/cirrus_vga.c | 4 ++-- hw/i8259.c | 3 ++- hw/ide/cmd646.c | 5 +++-- hw/ide/via.c | 5 +++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index e8dcc6b..909899d 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2055,8 +2055,8 @@ static void cirrus_vga_mem_write(void *opaque, } } else { #ifdef DEBUG_CIRRUS - printf("cirrus: mem_writeb " TARGET_FMT_plx " value %02x\n", addr, - mem_value); + printf("cirrus: mem_writeb " TARGET_FMT_plx " value %" PRIx64 "\n", + addr, mem_value); #endif } } diff --git a/hw/i8259.c b/hw/i8259.c index 53daf78..6587666 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -355,7 +355,8 @@ static uint64_t pic_ioport_read(void *opaque, target_phys_addr_t addr, ret = s->imr; } } - DPRINTF("read: addr=0x%02x val=0x%02x\n", addr, ret); + DPRINTF("read: addr=0x%02" TARGET_PRIxPHYS " val=0x%02x\n", + addr, ret); return ret; } diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index e0b9443..dd2855e 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -154,7 +154,7 @@ static uint64_t bmdma_read(void *opaque, target_phys_addr_t addr, break; } #ifdef DEBUG_IDE - printf("bmdma: readb 0x%02x : 0x%02x\n", addr, val); + printf("bmdma: readb 0x%02" TARGET_PRIxPHYS " : 0x%02x\n", addr, val); #endif return val; } @@ -170,7 +170,8 @@ static void bmdma_write(void *opaque, target_phys_addr_t addr, } #ifdef DEBUG_IDE - printf("bmdma: writeb 0x%02x : 0x%02x\n", addr, val); + printf("bmdma: writeb 0x%02" TARGET_PRIxPHYS " : 0x%02" PRIx64 "\n", + addr, val); #endif switch(addr & 3) { case 0: diff --git a/hw/ide/via.c b/hw/ide/via.c index b20e4f0..948a469 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -55,7 +55,7 @@ static uint64_t bmdma_read(void *opaque, target_phys_addr_t addr, break; } #ifdef DEBUG_IDE - printf("bmdma: readb 0x%02x : 0x%02x\n", addr, val); + printf("bmdma: readb 0x%02" TARGET_PRIxPHYS " : 0x%02x\n", addr, val); #endif return val; } @@ -70,7 +70,8 @@ static void bmdma_write(void *opaque, target_phys_addr_t addr, } #ifdef DEBUG_IDE - printf("bmdma: writeb 0x%02x : 0x%02x\n", addr, val); + printf("bmdma: writeb 0x%02" TARGET_PRIxPHYS " : 0x%02" PRIx64 "\n", + addr, val); #endif switch (addr & 3) { case 0: