Skip to content

Commit 7a12f51

Browse files
committed
tools headers kvm: Sync kvm headers with the kernel sources
To pick the changes in: bf653b7 ("KVM: vmx: Introduce handle_unexpected_vmexit and handle WAITPKG vmexit") That trigger these changes in tooling: CC /tmp/build/perf/arch/x86/util/kvm-stat.o INSTALL GTK UI DESCEND plugins make[3]: Nothing to be done for '/tmp/build/perf/plugins/libtraceevent-dynamic-list'. INSTALL trace_plugins LD /tmp/build/perf/arch/x86/util/perf-in.o LD /tmp/build/perf/arch/x86/perf-in.o LD /tmp/build/perf/arch/perf-in.o LD /tmp/build/perf/perf-in.o LINK /tmp/build/perf/perf And this is not just because that header is included, kvm-stat.c uses the VMX_EXIT_REASONS define and it got changed by the above cset. And addresses this perf build warnings: Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/vmx.h' differs from latest version at 'arch/x86/include/uapi/asm/vmx.h' diff -u tools/arch/x86/include/uapi/asm/vmx.h arch/x86/include/uapi/asm/vmx.h Cc: Adrian Hunter <[email protected]> Cc: David Ahern <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paolo Bonzini <[email protected]> Cc: Tao Xu <[email protected]> Cc: Wang Nan <[email protected]> Link: https://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent ae199c5 commit 7a12f51

File tree

1 file changed

+5
-1
lines changed
  • tools/arch/x86/include/uapi/asm

1 file changed

+5
-1
lines changed

tools/arch/x86/include/uapi/asm/vmx.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@
8686
#define EXIT_REASON_PML_FULL 62
8787
#define EXIT_REASON_XSAVES 63
8888
#define EXIT_REASON_XRSTORS 64
89+
#define EXIT_REASON_UMWAIT 67
90+
#define EXIT_REASON_TPAUSE 68
8991

9092
#define VMX_EXIT_REASONS \
9193
{ EXIT_REASON_EXCEPTION_NMI, "EXCEPTION_NMI" }, \
@@ -144,7 +146,9 @@
144146
{ EXIT_REASON_RDSEED, "RDSEED" }, \
145147
{ EXIT_REASON_PML_FULL, "PML_FULL" }, \
146148
{ EXIT_REASON_XSAVES, "XSAVES" }, \
147-
{ EXIT_REASON_XRSTORS, "XRSTORS" }
149+
{ EXIT_REASON_XRSTORS, "XRSTORS" }, \
150+
{ EXIT_REASON_UMWAIT, "UMWAIT" }, \
151+
{ EXIT_REASON_TPAUSE, "TPAUSE" }
148152

149153
#define VMX_ABORT_SAVE_GUEST_MSR_FAIL 1
150154
#define VMX_ABORT_LOAD_HOST_PDPTE_FAIL 2

0 commit comments

Comments
 (0)