[Qemu-devel] [PATCH] tracing: Rename cpu_in/out to pio_in/out

[Qemu-devel] [PATCH] tracing: Rename cpu_in/out to pio_in/out

[Jan Kiszka]

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 <jan.kiszka@siemens.com>
---
 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

[Qemu-devel] Re: [PATCH] tracing: Rename cpu_in/out to pio_in/out

[Stefan Hajnoczi]

On Tue, Oct 19, 2010 at 05:12:11PM +0200, Jan Kiszka wrote:
> 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 <jan.kiszka@siemens.com>
> ---
>  ioport.c     |   12 ++++++------
>  trace-events |    4 ++--
>  2 files changed, 8 insertions(+), 8 deletions(-)

Makes sense to me.

Acked-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>