This patch adds few more trace events for tracking IO and also to trace balloon event flagged via the monitor.
Signed-off-by: Prerna Saxena <pre...@linux.vnet.ibm.com> --- balloon.c | 2 ++ ioport.c | 7 +++++++ trace-events | 8 ++++++++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/balloon.c b/balloon.c index 8e0b7f1..0021fef 100644 --- a/balloon.c +++ b/balloon.c @@ -29,6 +29,7 @@ #include "cpu-common.h" #include "kvm.h" #include "balloon.h" +#include "trace.h" static QEMUBalloonEvent *qemu_balloon_event; @@ -43,6 +44,7 @@ void qemu_add_balloon_handler(QEMUBalloonEvent *func, void *opaque) int qemu_balloon(ram_addr_t target, MonitorCompletion cb, void *opaque) { if (qemu_balloon_event) { + trace_balloon_event(qemu_balloon_event_opaque, target); qemu_balloon_event(qemu_balloon_event_opaque, target, cb, opaque); return 1; } else { 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 80197b6..cade0b5 100644 --- a/trace-events +++ b/trace-events @@ -59,3 +59,11 @@ 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 %u Value %u" +cpu_out(unsigned int addr, unsigned int val) "Addr %u Value %u" + +# balloon.c +# Since requests are raised via monitor, not many tracepoints are needed. +balloon_event(void *opaque, unsigned long addr) "Opaque %p Addr %lu" -- 1.6.2.5 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India