tools arch uapi: Sync the x86 kvm.h copy
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 4312f2ab136a5f1a7b247f6e4a75b95afaf9d23b Gitweb: https://git.kernel.org/tip/4312f2ab136a5f1a7b247f6e4a75b95afaf9d23b Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 8 Oct 2018 12:04:51 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 8 Oct 2018 12:04:51 -0300
tools arch uapi: Sync the x86 kvm.h copy
To get the changes in:
d1766202779e ("x86/kvm/lapic: always disable MMIO interface in x2APIC mode")
That at this time will not generate changes in tools such as 'perf trace', that still needs more work in tools/perf/examples/bpf/augmented_syscalls.c to need such id -> string tables.
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
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 Vitaly Kuznetsov <[email protected]>
Cc Wang Nan <[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
@@ -377,6 +377,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_STATE_NESTED_GUEST_MODE 0x00000001#define KVM_STATE_NESTED_RUN_PENDING 0x00000002