From patchwork Thu Nov 12 01:09:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hollis Blanchard X-Patchwork-Id: 543165 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 765F214076B for ; Thu, 12 Nov 2015 12:11:05 +1100 (AEDT) Received: from localhost ([::1]:43857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwgPn-0008Dz-Nl for incoming@patchwork.ozlabs.org; Wed, 11 Nov 2015 20:11:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwgPH-0007b0-Ju for qemu-devel@nongnu.org; Wed, 11 Nov 2015 20:10:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwgPG-0001iG-3N for qemu-devel@nongnu.org; Wed, 11 Nov 2015 20:10:31 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:57736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwgPF-0001iA-JA for qemu-devel@nongnu.org; Wed, 11 Nov 2015 20:10:30 -0500 Received: from svr-orw-fem-04.mgc.mentorg.com ([147.34.97.41]) by relay1.mentorg.com with esmtp id 1ZwgPF-0007Gv-3c from Hollis_Blanchard@mentor.com for qemu-devel@nongnu.org; Wed, 11 Nov 2015 17:10:29 -0800 Received: from matte.unsanctioned (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.3.224.2; Wed, 11 Nov 2015 17:10:28 -0800 From: Hollis Blanchard To: Date: Wed, 11 Nov 2015 17:09:58 -0800 Message-ID: <1447290598-13069-2-git-send-email-hollis_blanchard@mentor.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1447290598-13069-1-git-send-email-hollis_blanchard@mentor.com> References: <1447290598-13069-1-git-send-email-hollis_blanchard@mentor.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 Cc: Hollis Blanchard Subject: [Qemu-devel] [PATCH 2/2] trace: show MemoryRegion name, not address 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 Recording the MemoryRegion pointers isn't helpful, especially since no trace data allows us to correlate those pointers to devices. Instead, record the MemoryRegion name. Signed-off-by: Hollis Blanchard --- memory.c | 12 ++++++------ trace-events | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/memory.c b/memory.c index c435c88..9bd4c31 100644 --- a/memory.c +++ b/memory.c @@ -381,7 +381,7 @@ static MemTxResult memory_region_oldmmio_read_accessor(MemoryRegion *mr, uint64_t tmp; tmp = mr->ops->old_mmio.read[ctz32(size)](mr->opaque, addr); - trace_memory_region_ops_read(mr, addr, tmp, size); + trace_memory_region_ops_read(mr->name, addr, tmp, size); *value |= (tmp & mask) << shift; return MEMTX_OK; } @@ -397,7 +397,7 @@ static MemTxResult memory_region_read_accessor(MemoryRegion *mr, uint64_t tmp; tmp = mr->ops->read(mr->opaque, addr, size); - trace_memory_region_ops_read(mr, addr, tmp, size); + trace_memory_region_ops_read(mr->name, addr, tmp, size); *value |= (tmp & mask) << shift; return MEMTX_OK; } @@ -414,7 +414,7 @@ static MemTxResult memory_region_read_with_attrs_accessor(MemoryRegion *mr, MemTxResult r; r = mr->ops->read_with_attrs(mr->opaque, addr, &tmp, size, attrs); - trace_memory_region_ops_read(mr, addr, tmp, size); + trace_memory_region_ops_read(mr->name, addr, tmp, size); *value |= (tmp & mask) << shift; return r; } @@ -430,7 +430,7 @@ static MemTxResult memory_region_oldmmio_write_accessor(MemoryRegion *mr, uint64_t tmp; tmp = (*value >> shift) & mask; - trace_memory_region_ops_write(mr, addr, tmp, size); + trace_memory_region_ops_write(mr->name, addr, tmp, size); mr->ops->old_mmio.write[ctz32(size)](mr->opaque, addr, tmp); return MEMTX_OK; } @@ -446,7 +446,7 @@ static MemTxResult memory_region_write_accessor(MemoryRegion *mr, uint64_t tmp; tmp = (*value >> shift) & mask; - trace_memory_region_ops_write(mr, addr, tmp, size); + trace_memory_region_ops_write(mr->name, addr, tmp, size); mr->ops->write(mr->opaque, addr, tmp, size); return MEMTX_OK; } @@ -462,7 +462,7 @@ static MemTxResult memory_region_write_with_attrs_accessor(MemoryRegion *mr, uint64_t tmp; tmp = (*value >> shift) & mask; - trace_memory_region_ops_write(mr, addr, tmp, size); + trace_memory_region_ops_write(mr->name, addr, tmp, size); return mr->ops->write_with_attrs(mr->opaque, addr, tmp, size, attrs); } diff --git a/trace-events b/trace-events index ef6bc41..23c11c3 100644 --- a/trace-events +++ b/trace-events @@ -1594,8 +1594,8 @@ disable exec_tb_exit(void *next_tb, unsigned int flags) "tb:%p flags=%x" translate_block(void *tb, uintptr_t pc, uint8_t *tb_code) "tb:%p, pc:0x%"PRIxPTR", tb_code:%p" # memory.c -memory_region_ops_read(void *mr, uint64_t addr, uint64_t value, unsigned size) "mr %p addr %#"PRIx64" value %#"PRIx64" size %u" -memory_region_ops_write(void *mr, uint64_t addr, uint64_t value, unsigned size) "mr %p addr %#"PRIx64" value %#"PRIx64" size %u" +memory_region_ops_read(const char *mr_name, uint64_t addr, uint64_t value, unsigned size) "dev %s addr %#"PRIx64" value %#"PRIx64" size %u" +memory_region_ops_write(const char *mr_name, uint64_t addr, uint64_t value, unsigned size) "dev %s addr %#"PRIx64" value %#"PRIx64" size %u" # qom/object.c object_dynamic_cast_assert(const char *type, const char *target, const char *file, int line, const char *func) "%s->%s (%s:%d:%s)"