Revert "KVM: MMU: show mmu_valid_gen in shadow page related tracepoints"

...as part of removing x86 KVM's fast invalidate mechanism, i.e. this
is one part of a revert all patches from the series that introduced the
mechanism[1].

This reverts commit 2248b023219251908aedda0621251cffc548f258.

[1] https://lkml.kernel.org/r/1369960590-14138-1-git-send-email-xiaoguangrong@linux.vnet.ibm.com

Cc: Xiao Guangrong <guangrong.xiao@gmail.com>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/mmutrace.h b/arch/x86/kvm/mmutrace.h
index cac88910b3103bb4ea731c5681978929627ccc53..9f6c855a00439a58f5c4ea58e099d935d65e22d9 100644 (file)
--- a/arch/x86/kvm/mmutrace.h
+++ b/arch/x86/kvm/mmutrace.h
@@ -8,18 +8,16 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kvmmmu
 
-#define KVM_MMU_PAGE_FIELDS                    \
-       __field(unsigned long, mmu_valid_gen)   \
-       __field(__u64, gfn)                     \
-       __field(__u32, role)                    \
-       __field(__u32, root_count)              \
+#define KVM_MMU_PAGE_FIELDS \
+       __field(__u64, gfn) \
+       __field(__u32, role) \
+       __field(__u32, root_count) \
        __field(bool, unsync)
 
-#define KVM_MMU_PAGE_ASSIGN(sp)                                \
-       __entry->mmu_valid_gen = sp->mmu_valid_gen;     \
-       __entry->gfn = sp->gfn;                         \
-       __entry->role = sp->role.word;                  \
-       __entry->root_count = sp->root_count;           \
+#define KVM_MMU_PAGE_ASSIGN(sp)                             \
+       __entry->gfn = sp->gfn;                      \
+       __entry->role = sp->role.word;               \
+       __entry->root_count = sp->root_count;        \
        __entry->unsync = sp->unsync;
 
 #define KVM_MMU_PAGE_PRINTK() ({                                       \
@@ -31,9 +29,8 @@
                                                                        \
        role.word = __entry->role;                                      \
                                                                        \
-       trace_seq_printf(p, "sp gen %lx gfn %llx l%u%s q%u%s %s%s"      \
+       trace_seq_printf(p, "sp gfn %llx l%u%s q%u%s %s%s"              \
                         " %snxe %sad root %u %s%c",                    \
-                        __entry->mmu_valid_gen,                        \
                         __entry->gfn, role.level,                      \
                         role.cr4_pae ? " pae" : "",                    \
                         role.quadrant,                                 \