Commit 1b3f004b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers UAPI: Sync x86's asm/kvm.h with the kernel sources 



To pick the changes in:

  6517dfbc ("KVM: x86: Add x2APIC "features" to control EOI broadcast suppression")
  20c3c410 ("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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4ebe2b8c

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

+6 −2
Original line number Diff line number Diff line
@@ -503,6 +503,7 @@ struct kvm_sync_regs { 
#define KVM_X86_GRP_SEV			1

#  define KVM_X86_SEV_VMSA_FEATURES	0

#  define KVM_X86_SNP_POLICY_BITS	1

#  define KVM_X86_SEV_SNP_REQ_CERTS	2



struct kvm_vmx_nested_state_data {

	__u8 vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];
@@ -743,6 +744,7 @@ enum sev_cmd_id { 
	KVM_SEV_SNP_LAUNCH_START = 100,

	KVM_SEV_SNP_LAUNCH_UPDATE,

	KVM_SEV_SNP_LAUNCH_FINISH,

	KVM_SEV_SNP_ENABLE_REQ_CERTS,



	KVM_SEV_NR_MAX,

};
@@ -914,8 +916,10 @@ struct kvm_sev_snp_launch_finish { 
	__u64 pad1[4];

};



#define KVM_X2APIC_API_USE_32BIT_IDS            (1ULL << 0)

#define KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK  (1ULL << 1)

#define KVM_X2APIC_API_USE_32BIT_IDS			_BITULL(0)

#define KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK		_BITULL(1)

#define KVM_X2APIC_ENABLE_SUPPRESS_EOI_BROADCAST	_BITULL(2)

#define KVM_X2APIC_DISABLE_SUPPRESS_EOI_BROADCAST	_BITULL(3)



struct kvm_hyperv_eventfd {

	__u32 conn_id;