KVM: convert custom marker based tracing to event traces

[safe/jmp/linux-2.6] / arch / x86 / kvm / lapic.c

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 3bde43c..2e02865 100644 (file)
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -34,6 +34,7 @@
 #include <asm/atomic.h>
 #include "kvm_cache_regs.h"
 #include "irq.h"
+#include "trace.h"
 
 #ifndef CONFIG_X86_64
 #define mod_64(x, y) ((x) - (y) * div64_u64(x, y))
@@ -515,8 +516,6 @@ static u32 __apic_read(struct kvm_lapic *apic, unsigned int offset)
 {
        u32 val = 0;
 
-       KVMTRACE_1D(APIC_ACCESS, apic->vcpu, (u32)offset, handler);
-
        if (offset >= LAPIC_MMIO_LENGTH)
                return 0;
 
@@ -562,6 +561,8 @@ static void apic_mmio_read(struct kvm_io_device *this,
        }
        result = __apic_read(apic, offset & ~0xf);
 
+       trace_kvm_apic_read(offset, result);
+
        switch (len) {
        case 1:
        case 2:
@@ -657,7 +658,7 @@ static void apic_mmio_write(struct kvm_io_device *this,
 
        offset &= 0xff0;
 
-       KVMTRACE_1D(APIC_ACCESS, apic->vcpu, (u32)offset, handler);
+       trace_kvm_apic_write(offset, val);
 
        switch (offset) {
        case APIC_ID:           /* Local APIC ID */