X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Farch%2Fx86%2Fkvm%2Fmmutrace.h;h=af3ede955f49386bd74e349eb11f2dfc54c84be1;hb=66d91dec14b558f3228b1d8d0d4641b948ac64dc;hp=dd0c6798f93c09727cb4982f38e4c84c70241583;hpb=c5db2e0a08684722408650d163ec777aafd69206;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
index dd0c6798..af3ede95 100644
--- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
+++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
@@ -51,7 +51,7 @@ LTTNG_TRACEPOINT_EVENT(
 	TP_ARGS(addr, pferr),
 
 	TP_FIELDS(
-		ctf_integer(__u64, addr, addr)
+		ctf_integer_hex(__u64, addr, addr)
 		ctf_integer(__u32, pferr, pferr)
 	)
 )
@@ -65,7 +65,7 @@ LTTNG_TRACEPOINT_EVENT(
 	TP_ARGS(addr, write_fault, user_fault, fetch_fault),
 
 	TP_FIELDS(
-		ctf_integer(__u64, addr, addr)
+		ctf_integer_hex(__u64, addr, addr)
 		ctf_integer(__u32, pferr,
 			(!!write_fault << 1) | (!!user_fault << 2)
 			| (!!fetch_fault << 4))
@@ -208,7 +208,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 	TP_ARGS(addr, gfn, access),
 
 	TP_FIELDS(
-		ctf_integer(u64, addr, addr)
+		ctf_integer_hex(u64, addr, addr)
 		ctf_integer(gfn_t, gfn, gfn)
 		ctf_integer(unsigned, access, access)
 	)
@@ -217,7 +217,9 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) || \
 	LTTNG_KERNEL_RANGE(4,19,103, 4,20,0) || \
 	LTTNG_KERNEL_RANGE(5,4,19, 5,5,0) || \
-	LTTNG_KERNEL_RANGE(5,5,3, 5,6,0))
+	LTTNG_KERNEL_RANGE(5,5,3, 5,6,0) || \
+	LTTNG_UBUNTU_KERNEL_RANGE(4,15,18,92, 4,16,0,0) || \
+	LTTNG_UBUNTU_KERNEL_RANGE(5,3,18,43, 5,4,0,0))
 LTTNG_TRACEPOINT_EVENT_MAP(
 	fast_page_fault,