From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=41300 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P8DrU-0006Vk-OA for qemu-devel@nongnu.org; Tue, 19 Oct 2010 11:12:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P8DrL-0007bp-Rx for qemu-devel@nongnu.org; Tue, 19 Oct 2010 11:12:24 -0400 Received: from goliath.siemens.de ([192.35.17.28]:20590) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P8DrL-0007bK-IY for qemu-devel@nongnu.org; Tue, 19 Oct 2010 11:12:15 -0400 Message-ID: <4CBDB54B.8090806@siemens.com> Date: Tue, 19 Oct 2010 17:12:11 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] tracing: Rename cpu_in/out to pio_in/out List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: qemu-devel This is a more commonly used term, including the KVM in-kernel tracepoints. Only QEMU developers probably know the relation between cpu_in/out services and I/O port access. Signed-off-by: Jan Kiszka --- ioport.c | 12 ++++++------ trace-events | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ioport.c b/ioport.c index ec3dc65..d16caa8 100644 --- a/ioport.c +++ b/ioport.c @@ -196,21 +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); + trace_pio_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); + trace_pio_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); + trace_pio_out(addr, val); ioport_write(2, addr, val); } @@ -218,7 +218,7 @@ uint8_t cpu_inb(pio_addr_t addr) { uint8_t val; val = ioport_read(0, addr); - trace_cpu_in(addr, val); + trace_pio_in(addr, val); LOG_IOPORT("inb : %04"FMT_pioaddr" %02"PRIx8"\n", addr, val); return val; } @@ -227,7 +227,7 @@ uint16_t cpu_inw(pio_addr_t addr) { uint16_t val; val = ioport_read(1, addr); - trace_cpu_in(addr, val); + trace_pio_in(addr, val); LOG_IOPORT("inw : %04"FMT_pioaddr" %04"PRIx16"\n", addr, val); return val; } @@ -236,7 +236,7 @@ uint32_t cpu_inl(pio_addr_t addr) { uint32_t val; val = ioport_read(2, addr); - trace_cpu_in(addr, val); + trace_pio_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 4300178..ee679e2 100644 --- a/trace-events +++ b/trace-events @@ -63,8 +63,8 @@ disable virtio_blk_handle_write(void *req, uint64_t sector, size_t nsectors) "re disable paio_submit(void *acb, void *opaque, int64_t sector_num, int nb_sectors, int type) "acb %p opaque %p sector_num %"PRId64" nb_sectors %d type %d" # ioport.c -disable cpu_in(unsigned int addr, unsigned int val) "addr %#x value %u" -disable cpu_out(unsigned int addr, unsigned int val) "addr %#x value %u" +disable pio_in(unsigned int addr, unsigned int val) "addr %#x value %u" +disable pio_out(unsigned int addr, unsigned int val) "addr %#x value %u" # balloon.c # Since requests are raised via monitor, not many tracepoints are needed. -- 1.7.1