From d8b08ae2853322bd9777024f35d1c35582b4ebb2 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 3 May 2013 09:02:43 -0400 Subject: [PATCH] Fix: warning kvm_trace_exit_reason redefined for 3.9 kernel Signed-off-by: Mathieu Desnoyers --- instrumentation/events/lttng-module/kvm.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h index ffdc2a62..7d3e735d 100644 --- a/instrumentation/events/lttng-module/kvm.h +++ b/instrumentation/events/lttng-module/kvm.h @@ -9,7 +9,17 @@ #define ERSN(x) { KVM_EXIT_##x, "KVM_EXIT_" #x } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) + +#define kvm_trace_exit_reason \ + ERSN(UNKNOWN), ERSN(EXCEPTION), ERSN(IO), ERSN(HYPERCALL), \ + ERSN(DEBUG), ERSN(HLT), ERSN(MMIO), ERSN(IRQ_WINDOW_OPEN), \ + ERSN(SHUTDOWN), ERSN(FAIL_ENTRY), ERSN(INTR), ERSN(SET_TPR), \ + ERSN(TPR_ACCESS), ERSN(S390_SIEIC), ERSN(S390_RESET), ERSN(DCR),\ + ERSN(NMI), ERSN(INTERNAL_ERROR), ERSN(OSI), ERSN(PAPR_HCALL), \ + ERSN(S390_UCONTROL), ERSN(WATCHDOG), ERSN(S390_TSCH) + +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) #define kvm_trace_exit_reason \ ERSN(UNKNOWN), ERSN(EXCEPTION), ERSN(IO), ERSN(HYPERCALL), \ -- 2.34.1