projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: build kvm probe on EL 8.4+
[lttng-modules.git]
/
include
/
instrumentation
/
events
/
arch
/
x86
/
kvm
/
trace.h
diff --git
a/include/instrumentation/events/arch/x86/kvm/trace.h
b/include/instrumentation/events/arch/x86/kvm/trace.h
index 0bccea064392f248a561c5e3b6214e5a0efa4c31..3cf18de84408e3e60e25da9de12e5543be24fcc6 100644
(file)
--- a/
include/instrumentation/events/arch/x86/kvm/trace.h
+++ b/
include/instrumentation/events/arch/x86/kvm/trace.h
@@
-179,7
+179,8
@@
LTTNG_TRACEPOINT_EVENT_CODE_MAP(kvm_exit, kvm_x86_exit,
TP_code_post()
)
TP_code_post()
)
-#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0))
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0) || \
+ LTTNG_RHEL_KERNEL_RANGE(4,18,0,240,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT_CODE_MAP(kvm_exit, kvm_x86_exit,
TP_PROTO(unsigned int exit_reason, struct kvm_vcpu *vcpu, u32 isa),
TP_ARGS(exit_reason, vcpu, isa),
LTTNG_TRACEPOINT_EVENT_CODE_MAP(kvm_exit, kvm_x86_exit,
TP_PROTO(unsigned int exit_reason, struct kvm_vcpu *vcpu, u32 isa),
TP_ARGS(exit_reason, vcpu, isa),
@@
-544,7
+545,8
@@
LTTNG_TRACEPOINT_EVENT_MAP(kvm_emulate_insn, kvm_x86_emulate_insn,
TP_ARGS(vcpu, failed),
TP_FIELDS(
TP_ARGS(vcpu, failed),
TP_FIELDS(
-#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(5,7,0))
+#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(5,7,0) && \
+ !LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0))
ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt._eip -
(vcpu->arch.emulate_ctxt.fetch.ptr -
vcpu->arch.emulate_ctxt.fetch.data))
ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt._eip -
(vcpu->arch.emulate_ctxt.fetch.ptr -
vcpu->arch.emulate_ctxt.fetch.data))
@@
-553,7
+555,8
@@
LTTNG_TRACEPOINT_EVENT_MAP(kvm_emulate_insn, kvm_x86_emulate_insn,
vcpu->arch.emulate_ctxt.fetch.data)
ctf_array(__u8, insn, vcpu->arch.emulate_ctxt.fetch.data, 15)
ctf_integer(__u8, flags, kei_decode_mode(vcpu->arch.emulate_ctxt.mode))
vcpu->arch.emulate_ctxt.fetch.data)
ctf_array(__u8, insn, vcpu->arch.emulate_ctxt.fetch.data, 15)
ctf_integer(__u8, flags, kei_decode_mode(vcpu->arch.emulate_ctxt.mode))
-#elif (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(5,18,0))
+#elif (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(5,18,0) || \
+ LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0))
ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt->_eip -
(vcpu->arch.emulate_ctxt->fetch.ptr -
vcpu->arch.emulate_ctxt->fetch.data))
ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt->_eip -
(vcpu->arch.emulate_ctxt->fetch.ptr -
vcpu->arch.emulate_ctxt->fetch.data))
This page took
0.02425 seconds
and
4
git commands to generate.