Skip to content

Commit e5bc0de

Browse files
committed
tools headers UAPI: Sync x86's asm/kvm.h with the kernel sources
To pick the changes in: 43bb9e0 ("KVM: x86: Tweak name of MONITOR/MWAIT #UD quirk to make it #UD specific") 94dfc73 ("treewide: uapi: Replace zero-length arrays with flexible-array members") bfbcc81 ("KVM: x86: Add a quirk for KVM's "MONITOR/MWAIT are NOPs!" behavior") b172862 ("KVM: x86: PIT: Preserve state of speaker port data bit") ed23511 ("KVM: x86: Extend KVM_{G,S}ET_VCPU_EVENTS to support pending triple fault") 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: Chenyi Qiang <[email protected]> Cc: Sean Christopherson <[email protected]> Cc: Gustavo A. R. Silva <[email protected]> Cc: Paolo Bonzini <[email protected]> Cc: Paul Durrant <[email protected]> Link: https://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent eea085d commit e5bc0de

File tree

1 file changed

+8
-2
lines changed
  • tools/arch/x86/include/uapi/asm

1 file changed

+8
-2
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,8 @@ struct kvm_pit_state {
306306
struct kvm_pit_channel_state channels[3];
307307
};
308308

309-
#define KVM_PIT_FLAGS_HPET_LEGACY 0x00000001
309+
#define KVM_PIT_FLAGS_HPET_LEGACY 0x00000001
310+
#define KVM_PIT_FLAGS_SPEAKER_DATA_ON 0x00000002
310311

311312
struct kvm_pit_state2 {
312313
struct kvm_pit_channel_state channels[3];
@@ -325,6 +326,7 @@ struct kvm_reinject_control {
325326
#define KVM_VCPUEVENT_VALID_SHADOW 0x00000004
326327
#define KVM_VCPUEVENT_VALID_SMM 0x00000008
327328
#define KVM_VCPUEVENT_VALID_PAYLOAD 0x00000010
329+
#define KVM_VCPUEVENT_VALID_TRIPLE_FAULT 0x00000020
328330

329331
/* Interrupt shadow states */
330332
#define KVM_X86_SHADOW_INT_MOV_SS 0x01
@@ -359,7 +361,10 @@ struct kvm_vcpu_events {
359361
__u8 smm_inside_nmi;
360362
__u8 latched_init;
361363
} smi;
362-
__u8 reserved[27];
364+
struct {
365+
__u8 pending;
366+
} triple_fault;
367+
__u8 reserved[26];
363368
__u8 exception_has_payload;
364369
__u64 exception_payload;
365370
};
@@ -434,6 +439,7 @@ struct kvm_sync_regs {
434439
#define KVM_X86_QUIRK_OUT_7E_INC_RIP (1 << 3)
435440
#define KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT (1 << 4)
436441
#define KVM_X86_QUIRK_FIX_HYPERCALL_INSN (1 << 5)
442+
#define KVM_X86_QUIRK_MWAIT_NEVER_UD_FAULTS (1 << 6)
437443

438444
#define KVM_STATE_NESTED_FORMAT_VMX 0
439445
#define KVM_STATE_NESTED_FORMAT_SVM 1

0 commit comments

Comments
 (0)