Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ed152af authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Avi Kivity
Browse files

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: default avatarXiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 06056bfb

arch/x86/kvm/mmu.c

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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.
@@ -575,5 +573,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
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include <linux/srcu.h>

#include <linux/slab.h>

#include <trace/events/kvm.h>

#undef TRACE_INCLUDE_FILE



#define CREATE_TRACE_POINTS

#include "trace.h"

include/trace/events/kvm.h

+0 −1
Original line number Diff line number Diff line
@@ -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,