kvm: cleanup kvm trace
PATCH 1/1 kvm: cleanup kvm trace
This patch does:
- no need call tracepoint_synchronize_unregister() when kvm module is unloaded since ftrace can handle it
- cleanup ftrace's macro
Signed-off-by Xiao Guangrong <[email protected]>
--- arch/x86/kvm/mmu.c | 1 - arch/x86/kvm/mmutrace.h | 7 +++++-- arch/x86/kvm/trace.h | 7 +++++-- arch/x86/kvm/x86.c | 2 +- include/trace/events/kvm.h | 1 - virt/kvm/kvm_main.c | 1 - 6 files changed, 11 insertions(+), 8 deletions(-)
arch/x86/kvm/mmu.c +0 -1
@@ -147,7 +147,6 @@ module_param(oos_shadow, bool, 0644);#include <trace/events/kvm.h> -#undef TRACE_INCLUDE_FILE#define CREATE_TRACE_POINTS #include "mmutrace.h"
arch/x86/kvm/mmutrace.h +5 -2
@@ -6,8 +6,6 @@#undef TRACE_SYSTEM#define TRACE_SYSTEM kvmmmu -#define TRACE_INCLUDE_PATH . -#define TRACE_INCLUDE_FILE mmutrace#define KVM_MMU_PAGE_FIELDS \ __field(__u64, gfn) \
@@ -216,5 +214,10 @@ TRACE_EVENT(#endif /* _TRACE_KVMMMU_H */ +#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH . +#undef TRACE_INCLUDE_FILE +#define TRACE_INCLUDE_FILE mmutrace +/* This part must be outside protection */ #include <trace/define_trace.h>
arch/x86/kvm/trace.h +5 -2
@@ -5,8 +5,6 @@#undef TRACE_SYSTEM#define TRACE_SYSTEM kvm -#define TRACE_INCLUDE_PATH arch/x86/kvm -#define TRACE_INCLUDE_FILE trace/* * Tracepoint for guest mode entry.
@@ -553,5 +551,10 @@ TRACE_EVENT(kvm_skinit,#endif /* _TRACE_KVM_H */ +#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH arch/x86/kvm +#undef TRACE_INCLUDE_FILE +#define TRACE_INCLUDE_FILE trace +/* This part must be outside protection */ #include <trace/define_trace.h>
arch/x86/kvm/x86.c +1 -1
@@ -40,7 +40,7 @@#include <linux/user-return-notifier.h> #include <linux/srcu.h> #include <trace/events/kvm.h> -#undef TRACE_INCLUDE_FILE +#define CREATE_TRACE_POINTS #include "trace.h"
include/trace/events/kvm.h +0 -1
@@ -5,7 +5,6 @@#undef TRACE_SYSTEM#define TRACE_SYSTEM kvm -#define TRACE_INCLUDE_FILE kvm#if defined(__KVM_HAVE_IOAPIC) TRACE_EVENT(kvm_set_irq,
virt/kvm/kvm_main.c +0 -1
@@ -2272,7 +2272,6 @@ EXPORT_SYMBOL_GPL(kvm_init);void kvm_exit (void ) { -tracepoint_synchronize_unregister ();kvm_exit_debug ();misc_deregister (&kvm_dev);kmem_cache_destroy (kvm_vcpu_cache);
Signature · 1 line
1.6.1.2
Avi Kivity
AppliedQuoted 7 lines · Xiao Guangrong
This patch does:
- no need call
tracepoint_synchronize_unregister()when kvm module is unloaded since ftrace can handle it- cleanup ftrace's macro
Applied, thanks.
Signature · 1 line
error compiling committee.c: too many arguments to function