tools arch uapi: Sync the x86 kvm.h copy
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: f98f10f35257d3c8c73104956f3b7aa6e6f75067 Gitweb: https://git.kernel.org/tip/f98f10f35257d3c8c73104956f3b7aa6e6f75067 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 13 May 2019 13:27:12 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 15 May 2019 16:36:46 -0300
tools arch uapi: Sync the x86 kvm.h copy
To get the changes in:
59073aaf6de0 ("kvm: x86: Add exception payload fields to kvm_vcpu_events")
This silences the following perf build warning:
Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/kvm.h' differs from latest version at 'arch/x86/include/uapi/asm/kvm.h' diff -u tools/arch/x86/include/uapi/asm/kvm.h arch/x86/include/uapi/asm/kvm.h
The changes in this file are in something not used at this time in any tools/perf/ tool.
Cc Adrian Hunter <[email protected]>
Cc Jim Mattson <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paolo Bonzini <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/arch/x86/include/uapi/asm/kvm.h | 1 + 1 file changed, 1 insertion(+)
tools/arch/x86/include/uapi/asm/kvm.h +1 -0
@@ -381,6 +381,7 @@ struct kvm_sync_regs {#define KVM_X86_QUIRK_LINT0_REENABLED (1 << 0)#define KVM_X86_QUIRK_CD_NW_CLEARED (1 << 1)#define KVM_X86_QUIRK_LAPIC_MMIO_HOLE (1 << 2) +#define KVM_X86_QUIRK_OUT_7E_INC_RIP (1 << 3)#define KVM_STATE_NESTED_GUEST_MODE 0x00000001#define KVM_STATE_NESTED_RUN_PENDING 0x00000002