From patchwork Thu Feb 18 04:18:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 8345411 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 616BAC0553 for ; Thu, 18 Feb 2016 04:21:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B391020204 for ; Thu, 18 Feb 2016 04:21:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A590020221 for ; Thu, 18 Feb 2016 04:21:57 +0000 (UTC) Received: from localhost ([::1]:36543 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWG6G-0007Zq-UZ for patchwork-qemu-devel@patchwork.kernel.org; Wed, 17 Feb 2016 23:21:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWG2I-00007i-OD for qemu-devel@nongnu.org; Wed, 17 Feb 2016 23:17:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWG2F-0008Hj-Hh for qemu-devel@nongnu.org; Wed, 17 Feb 2016 23:17:50 -0500 Received: from ozlabs.org ([103.22.144.67]:57529) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWG2F-0008Gp-6w; Wed, 17 Feb 2016 23:17:47 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3BF29140328; Thu, 18 Feb 2016 15:17:46 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1455769066; bh=JxS/QtNwBYmq26hLkwIUdUAOzwaRCaemDyGwvX7fvM8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l+k75SOiLh7xKIWQgiMjIZLNroSDMZzCPWsT3r6S1Mi6yD6DRfLwPdPiEhNipePBm WQo3Z+HIJiIy5DiMinAQ4fPp3jlXaL1/yXulgcfVk+P76X9f+Novl3sTkCrpZz5Gc7 gli0EMsIcJul2hHkaUM9cde849Er2EiXqgkmguvQ= From: David Gibson To: peter.maydell@linaro.org Date: Thu, 18 Feb 2016 15:18:22 +1100 Message-Id: <1455769127-26005-2-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455769127-26005-1-git-send-email-david@gibson.dropbear.id.au> References: <1455769127-26005-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Cc: aik@ozlabs.ru, mark.cave-ayland@ilande.co.uk, agraf@suse.de, qemu-devel@nongnu.org, Alyssa Milburn , qemu-ppc@nongnu.org, David Gibson Subject: [Qemu-devel] [PULL 01/26] hw: fix some debug message 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Alyssa Milburn Signed-off-by: Alyssa Milburn Signed-off-by: David Gibson --- hw/nvram/mac_nvram.c | 6 ++++-- hw/pci-host/uninorth.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c index 564ef93..1671f46 100644 --- a/hw/nvram/mac_nvram.c +++ b/hw/nvram/mac_nvram.c @@ -49,7 +49,8 @@ static void macio_nvram_writeb(void *opaque, hwaddr addr, addr = (addr >> s->it_shift) & (s->size - 1); s->data[addr] = value; - NVR_DPRINTF("writeb addr %04" PHYS_PRIx " val %" PRIx64 "\n", addr, value); + NVR_DPRINTF("writeb addr %04" HWADDR_PRIx " val %" PRIx64 "\n", + addr, value); } static uint64_t macio_nvram_readb(void *opaque, hwaddr addr, @@ -60,7 +61,8 @@ static uint64_t macio_nvram_readb(void *opaque, hwaddr addr, addr = (addr >> s->it_shift) & (s->size - 1); value = s->data[addr]; - NVR_DPRINTF("readb addr %04x val %x\n", (int)addr, value); + NVR_DPRINTF("readb addr %04" HWADDR_PRIx " val %" PRIx32 "\n", + addr, value); return value; } diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index 40a2e3e..15b1054 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.c @@ -120,7 +120,7 @@ static void unin_data_write(void *opaque, hwaddr addr, { UNINState *s = opaque; PCIHostState *phb = PCI_HOST_BRIDGE(s); - UNIN_DPRINTF("write addr %" TARGET_FMT_plx " len %d val %"PRIx64"\n", + UNIN_DPRINTF("write addr " TARGET_FMT_plx " len %d val %"PRIx64"\n", addr, len, val); pci_data_write(phb->bus, unin_get_config_reg(phb->config_reg, addr), @@ -137,7 +137,7 @@ static uint64_t unin_data_read(void *opaque, hwaddr addr, val = pci_data_read(phb->bus, unin_get_config_reg(phb->config_reg, addr), len); - UNIN_DPRINTF("read addr %" TARGET_FMT_plx " len %d val %x\n", + UNIN_DPRINTF("read addr " TARGET_FMT_plx " len %d val %x\n", addr, len, val); return val; }