summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiao Guangrong <xiaoguangrong@cn.fujitsu.com>2010-11-01 11:59:39 +0300
committerAvi Kivity <avi@redhat.com>2011-01-12 12:28:57 +0300
commit0730388b97d20cc568c25b42b9a23b28959b481f (patch)
tree6e0cdedd190b73575314138f8b67ee064afa3ee2
parentc9b263d2be9c535b410f6617710534f798bf0ff0 (diff)
downloadlinux-0730388b97d20cc568c25b42b9a23b28959b481f.tar.xz
KVM: cleanup async_pf tracepoints
Use 'DECLARE_EVENT_CLASS' to cleanup async_pf tracepoints Acked-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--include/trace/events/kvm.h76
1 files changed, 35 insertions, 41 deletions
diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h
index d94d6c312ca1..46e3cd8e197a 100644
--- a/include/trace/events/kvm.h
+++ b/include/trace/events/kvm.h
@@ -216,59 +216,71 @@ TRACE_EVENT(kvm_age_page,
);
#ifdef CONFIG_KVM_ASYNC_PF
-TRACE_EVENT(
- kvm_try_async_get_page,
+DECLARE_EVENT_CLASS(kvm_async_get_page_class,
+
TP_PROTO(u64 gva, u64 gfn),
+
TP_ARGS(gva, gfn),
TP_STRUCT__entry(
- __field(u64, gva)
+ __field(__u64, gva)
__field(u64, gfn)
- ),
+ ),
TP_fast_assign(
__entry->gva = gva;
__entry->gfn = gfn;
- ),
+ ),
TP_printk("gva = %#llx, gfn = %#llx", __entry->gva, __entry->gfn)
);
-TRACE_EVENT(
- kvm_async_pf_not_present,
+DEFINE_EVENT(kvm_async_get_page_class, kvm_try_async_get_page,
+
+ TP_PROTO(u64 gva, u64 gfn),
+
+ TP_ARGS(gva, gfn)
+);
+
+DEFINE_EVENT(kvm_async_get_page_class, kvm_async_pf_doublefault,
+
+ TP_PROTO(u64 gva, u64 gfn),
+
+ TP_ARGS(gva, gfn)
+);
+
+DECLARE_EVENT_CLASS(kvm_async_pf_nopresent_ready,
+
TP_PROTO(u64 token, u64 gva),
+
TP_ARGS(token, gva),
TP_STRUCT__entry(
__field(__u64, token)
__field(__u64, gva)
- ),
+ ),
TP_fast_assign(
__entry->token = token;
__entry->gva = gva;
- ),
+ ),
+
+ TP_printk("token %#llx gva %#llx", __entry->token, __entry->gva)
- TP_printk("token %#llx gva %#llx not present", __entry->token,
- __entry->gva)
);
-TRACE_EVENT(
- kvm_async_pf_ready,
+DEFINE_EVENT(kvm_async_pf_nopresent_ready, kvm_async_pf_not_present,
+
TP_PROTO(u64 token, u64 gva),
- TP_ARGS(token, gva),
- TP_STRUCT__entry(
- __field(__u64, token)
- __field(__u64, gva)
- ),
+ TP_ARGS(token, gva)
+);
- TP_fast_assign(
- __entry->token = token;
- __entry->gva = gva;
- ),
+DEFINE_EVENT(kvm_async_pf_nopresent_ready, kvm_async_pf_ready,
+
+ TP_PROTO(u64 token, u64 gva),
- TP_printk("token %#llx gva %#llx ready", __entry->token, __entry->gva)
+ TP_ARGS(token, gva)
);
TRACE_EVENT(
@@ -292,24 +304,6 @@ TRACE_EVENT(
__entry->address, __entry->pfn)
);
-TRACE_EVENT(
- kvm_async_pf_doublefault,
- TP_PROTO(u64 gva, u64 gfn),
- TP_ARGS(gva, gfn),
-
- TP_STRUCT__entry(
- __field(u64, gva)
- __field(u64, gfn)
- ),
-
- TP_fast_assign(
- __entry->gva = gva;
- __entry->gfn = gfn;
- ),
-
- TP_printk("gva = %#llx, gfn = %#llx", __entry->gva, __entry->gfn)
-);
-
#endif
#endif /* _TRACE_KVM_MAIN_H */