From patchwork Thu Aug 12 10:36:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 61597 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2431DB70CE for ; Thu, 12 Aug 2010 23:53:02 +1000 (EST) Received: from localhost ([127.0.0.1]:52759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OjYDL-0000JS-5X for incoming@patchwork.ozlabs.org; Thu, 12 Aug 2010 09:52:59 -0400 Received: from [140.186.70.92] (port=54008 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OjYBq-0000HR-PH for qemu-devel@nongnu.org; Thu, 12 Aug 2010 09:51:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OjYBo-0006ft-JZ for qemu-devel@nongnu.org; Thu, 12 Aug 2010 09:51:25 -0400 Received: from mtagate4.de.ibm.com ([195.212.17.164]:55801) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OjYBo-0006fg-Bo for qemu-devel@nongnu.org; Thu, 12 Aug 2010 09:51:24 -0400 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate4.de.ibm.com (8.13.1/8.13.1) with ESMTP id o7CAaoF9021633 for ; Thu, 12 Aug 2010 10:36:50 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o7CAaoRS1667158 for ; Thu, 12 Aug 2010 12:36:50 +0200 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id o7CAanW0022728 for ; Thu, 12 Aug 2010 12:36:50 +0200 Received: from stefan-thinkpad.ibm.com (dev11556.de.ibm.com [9.145.242.211]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id o7CAahLx022591; Thu, 12 Aug 2010 12:36:49 +0200 From: Stefan Hajnoczi To: Date: Thu, 12 Aug 2010 11:36:26 +0100 Message-Id: <1281609395-17621-6-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1281609395-17621-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1281609395-17621-1-git-send-email-stefanha@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Julien Desfossez , Stefan Hajnoczi , Prerna Saxena Subject: [Qemu-devel] [PATCH 05/14] trace: Trace port IO X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Prerna Saxena Signed-off-by: Prerna Saxena Signed-off-by: Stefan Hajnoczi --- ioport.c | 7 +++++++ trace-events | 4 ++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/ioport.c b/ioport.c index 53dd87a..ec3dc65 100644 --- a/ioport.c +++ b/ioport.c @@ -26,6 +26,7 @@ */ #include "ioport.h" +#include "trace.h" /***********************************************************/ /* IO Port */ @@ -195,18 +196,21 @@ void isa_unassign_ioport(pio_addr_t start, int length) void cpu_outb(pio_addr_t addr, uint8_t val) { LOG_IOPORT("outb: %04"FMT_pioaddr" %02"PRIx8"\n", addr, val); + trace_cpu_out(addr, val); ioport_write(0, addr, val); } void cpu_outw(pio_addr_t addr, uint16_t val) { LOG_IOPORT("outw: %04"FMT_pioaddr" %04"PRIx16"\n", addr, val); + trace_cpu_out(addr, val); ioport_write(1, addr, val); } void cpu_outl(pio_addr_t addr, uint32_t val) { LOG_IOPORT("outl: %04"FMT_pioaddr" %08"PRIx32"\n", addr, val); + trace_cpu_out(addr, val); ioport_write(2, addr, val); } @@ -214,6 +218,7 @@ uint8_t cpu_inb(pio_addr_t addr) { uint8_t val; val = ioport_read(0, addr); + trace_cpu_in(addr, val); LOG_IOPORT("inb : %04"FMT_pioaddr" %02"PRIx8"\n", addr, val); return val; } @@ -222,6 +227,7 @@ uint16_t cpu_inw(pio_addr_t addr) { uint16_t val; val = ioport_read(1, addr); + trace_cpu_in(addr, val); LOG_IOPORT("inw : %04"FMT_pioaddr" %04"PRIx16"\n", addr, val); return val; } @@ -230,6 +236,7 @@ uint32_t cpu_inl(pio_addr_t addr) { uint32_t val; val = ioport_read(2, addr); + trace_cpu_in(addr, val); LOG_IOPORT("inl : %04"FMT_pioaddr" %08"PRIx32"\n", addr, val); return val; } diff --git a/trace-events b/trace-events index 9a3f6a6..c1f3e28 100644 --- a/trace-events +++ b/trace-events @@ -54,3 +54,7 @@ virtio_blk_handle_write(void *req, unsigned long sector, unsigned long nsectors) # posix-aio-compat.c paio_submit(void *acb, void *opaque, unsigned long sector_num, unsigned long nb_sectors, unsigned long type) "acb %p opaque %p sector_num %lu nb_sectors %lu type %lu" + +# ioport.c +cpu_in(unsigned int addr, unsigned int val) "addr %#x value %u" +cpu_out(unsigned int addr, unsigned int val) "addr %#x value %u"