From patchwork Mon Mar 13 19:55:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 9622033 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6185B60244 for ; Mon, 13 Mar 2017 20:08:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55E0328138 for ; Mon, 13 Mar 2017 20:08:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 47F0C283A6; Mon, 13 Mar 2017 20:08:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id EB87228138 for ; Mon, 13 Mar 2017 20:08:32 +0000 (UTC) Received: from localhost ([::1]:54160 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnWGd-0002WH-Ue for patchwork-qemu-devel@patchwork.kernel.org; Mon, 13 Mar 2017 16:08:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43096) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnW4m-0000qJ-75 for qemu-devel@nongnu.org; Mon, 13 Mar 2017 15:56:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnW4l-0002be-GH for qemu-devel@nongnu.org; Mon, 13 Mar 2017 15:56:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46906) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cnW4l-0002av-BK for qemu-devel@nongnu.org; Mon, 13 Mar 2017 15:56:15 -0400 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4BBC7A0B50 for ; Mon, 13 Mar 2017 19:56:15 +0000 (UTC) Received: from red.redhat.com (unknown [10.10.121.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 985B32D5C1; Mon, 13 Mar 2017 19:56:14 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 13 Mar 2017 14:55:39 -0500 Message-Id: <20170313195547.21466-23-eblake@redhat.com> In-Reply-To: <20170313195547.21466-1-eblake@redhat.com> References: <20170313195547.21466-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 13 Mar 2017 19:56:15 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 22/30] trace: Fix parameter types in hw/nvram X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stefanha@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP An upcoming patch will let the compiler warn us when we are silently losing precision in traces; update the traces to use types matching the callers, and in this case, make sure all callers pass the same width type. Signed-off-by: Eric Blake --- hw/nvram/fw_cfg.c | 2 +- hw/nvram/trace-events | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 316fca9..5c328c8 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -435,7 +435,7 @@ static void fw_cfg_dma_transfer(FWCfgState *s) stl_be_dma(s->dma_as, dma_addr + offsetof(FWCfgDmaAccess, control), dma.control); - trace_fw_cfg_read(s, 0); + trace_fw_cfg_read(s, (uint64_t) 0); } static uint64_t fw_cfg_dma_mem_read(void *opaque, hwaddr addr, diff --git a/hw/nvram/trace-events b/hw/nvram/trace-events index 1f1e05a..32d67c2 100644 --- a/hw/nvram/trace-events +++ b/hw/nvram/trace-events @@ -1,8 +1,8 @@ # See docs/tracing.txt for syntax documentation. # hw/nvram/ds1225y.c -nvram_read(uint32_t addr, uint32_t ret) "read addr %d: 0x%02x" -nvram_write(uint32_t addr, uint32_t old, uint32_t val) "write addr %d: 0x%02x -> 0x%02x" +nvram_read(hwaddr addr, uint32_t ret) "read addr %" HWADDR_PRId ": 0x%02x" +nvram_write(hwaddr addr, uint32_t old, uint64_t val) "write addr %" HWADDR_PRId ": 0x%02x -> 0x%02" PRIx64 # hw/nvram/fw_cfg.c fw_cfg_select(void *s, uint16_t key, int ret) "%p key %d = %d"