Skip to content

Commit 1b3f004

Browse files
committed
tools headers UAPI: Sync x86's asm/kvm.h with the kernel sources
To pick the changes in: 6517dfb ("KVM: x86: Add x2APIC "features" to control EOI broadcast suppression") 20c3c41 ("KVM: SEV: Add KVM_SEV_SNP_ENABLE_REQ_CERTS command") This silences these perf build warning: Warning: Kernel ABI header differences: diff -u tools/arch/x86/include/uapi/asm/kvm.h arch/x86/include/uapi/asm/kvm.h Please see tools/include/uapi/README for further details. Cc: Sean Christopherson <seanjc@google.com> Cc: Khushit Shah <khushit.shah@nutanix.com> Cc: Michael Roth <michael.roth@amd.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 4ebe2b8 commit 1b3f004

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

  • tools/arch/x86/include/uapi/asm

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@ struct kvm_sync_regs {
503503
#define KVM_X86_GRP_SEV 1
504504
# define KVM_X86_SEV_VMSA_FEATURES 0
505505
# define KVM_X86_SNP_POLICY_BITS 1
506+
# define KVM_X86_SEV_SNP_REQ_CERTS 2
506507

507508
struct kvm_vmx_nested_state_data {
508509
__u8 vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];
@@ -743,6 +744,7 @@ enum sev_cmd_id {
743744
KVM_SEV_SNP_LAUNCH_START = 100,
744745
KVM_SEV_SNP_LAUNCH_UPDATE,
745746
KVM_SEV_SNP_LAUNCH_FINISH,
747+
KVM_SEV_SNP_ENABLE_REQ_CERTS,
746748

747749
KVM_SEV_NR_MAX,
748750
};
@@ -914,8 +916,10 @@ struct kvm_sev_snp_launch_finish {
914916
__u64 pad1[4];
915917
};
916918

917-
#define KVM_X2APIC_API_USE_32BIT_IDS (1ULL << 0)
918-
#define KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK (1ULL << 1)
919+
#define KVM_X2APIC_API_USE_32BIT_IDS _BITULL(0)
920+
#define KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK _BITULL(1)
921+
#define KVM_X2APIC_ENABLE_SUPPRESS_EOI_BROADCAST _BITULL(2)
922+
#define KVM_X2APIC_DISABLE_SUPPRESS_EOI_BROADCAST _BITULL(3)
919923

920924
struct kvm_hyperv_eventfd {
921925
__u32 conn_id;

0 commit comments

Comments
 (0)