Skip to content

Commit 2e323f3

Browse files
committed
tools headers UAPI: Sync x86's asm/kvm.h with the kernel sources
To pick the changes in: f1a9761 ("KVM: x86: Allow userspace to opt out of hypercall patching") That just rebuilds kvm-stat.c on x86, no change in functionality. This silences these 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: Oliver Upton <[email protected]> Cc: Paolo Bonzini <[email protected]> Link: https://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 51ba539 commit 2e323f3

File tree

1 file changed

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

1 file changed

+6
-5
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -428,11 +428,12 @@ struct kvm_sync_regs {
428428
struct kvm_vcpu_events events;
429429
};
430430

431-
#define KVM_X86_QUIRK_LINT0_REENABLED (1 << 0)
432-
#define KVM_X86_QUIRK_CD_NW_CLEARED (1 << 1)
433-
#define KVM_X86_QUIRK_LAPIC_MMIO_HOLE (1 << 2)
434-
#define KVM_X86_QUIRK_OUT_7E_INC_RIP (1 << 3)
435-
#define KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT (1 << 4)
431+
#define KVM_X86_QUIRK_LINT0_REENABLED (1 << 0)
432+
#define KVM_X86_QUIRK_CD_NW_CLEARED (1 << 1)
433+
#define KVM_X86_QUIRK_LAPIC_MMIO_HOLE (1 << 2)
434+
#define KVM_X86_QUIRK_OUT_7E_INC_RIP (1 << 3)
435+
#define KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT (1 << 4)
436+
#define KVM_X86_QUIRK_FIX_HYPERCALL_INSN (1 << 5)
436437

437438
#define KVM_STATE_NESTED_FORMAT_VMX 0
438439
#define KVM_STATE_NESTED_FORMAT_SVM 1

0 commit comments

Comments
 (0)