Skip to content

Commit 33dc525

Browse files
committedMar 6, 2021
tools headers UAPI: Sync KVM's kvm.h and vmx.h headers with the kernel sources
To pick the changes in: fe6b6bc ("KVM: VMX: Enable bus lock VM exit") That makes 'perf kvm-stat' aware of this new BUS_LOCK exit reason, thus addressing the following perf build warning: 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: Chenyi Qiang <chenyi.qiang@intel.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 1a9bcad commit 33dc525

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed
 

‎tools/arch/x86/include/uapi/asm/kvm.h

+1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ struct kvm_ioapic_state {
112112
#define KVM_NR_IRQCHIPS 3
113113

114114
#define KVM_RUN_X86_SMM (1 << 0)
115+
#define KVM_RUN_X86_BUS_LOCK (1 << 1)
115116

116117
/* for KVM_GET_REGS and KVM_SET_REGS */
117118
struct kvm_regs {

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
#define EXIT_REASON_XRSTORS 64
9090
#define EXIT_REASON_UMWAIT 67
9191
#define EXIT_REASON_TPAUSE 68
92+
#define EXIT_REASON_BUS_LOCK 74
9293

9394
#define VMX_EXIT_REASONS \
9495
{ EXIT_REASON_EXCEPTION_NMI, "EXCEPTION_NMI" }, \
@@ -150,7 +151,8 @@
150151
{ EXIT_REASON_XSAVES, "XSAVES" }, \
151152
{ EXIT_REASON_XRSTORS, "XRSTORS" }, \
152153
{ EXIT_REASON_UMWAIT, "UMWAIT" }, \
153-
{ EXIT_REASON_TPAUSE, "TPAUSE" }
154+
{ EXIT_REASON_TPAUSE, "TPAUSE" }, \
155+
{ EXIT_REASON_BUS_LOCK, "BUS_LOCK" }
154156

155157
#define VMX_EXIT_REASON_FLAGS \
156158
{ VMX_EXIT_REASONS_FAILED_VMENTRY, "FAILED_VMENTRY" }

0 commit comments

Comments
 (0)