Commit bf07be36 authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Paolo Bonzini
Browse files

KVM: x86: do not use KVM_X86_OP_OPTIONAL_RET0 for get_mt_mask 



KVM_X86_OP_OPTIONAL_RET0 can only be used with 32-bit return values on 32-bit
systems, because unsigned long is only 32-bits wide there and 64-bit values
are returned in edx:eax.

Reported-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 873dd122

arch/x86/include/asm/kvm-x86-ops.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ KVM_X86_OP(deliver_interrupt) 
KVM_X86_OP_OPTIONAL(sync_pir_to_irr)

KVM_X86_OP_OPTIONAL_RET0(set_tss_addr)

KVM_X86_OP_OPTIONAL_RET0(set_identity_map_addr)

KVM_X86_OP_OPTIONAL_RET0(get_mt_mask)

KVM_X86_OP(get_mt_mask)

KVM_X86_OP(load_mmu_pgd)

KVM_X86_OP(has_wbinvd_exit)

KVM_X86_OP(get_l2_tsc_offset)

arch/x86/kvm/svm/svm.c

+6 −0
Original line number Diff line number Diff line
@@ -3939,6 +3939,11 @@ static bool svm_has_emulated_msr(struct kvm *kvm, u32 index) 
	return true;

}



static u64 svm_get_mt_mask(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio)

{

	return 0;

}



static void svm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)

{

	struct vcpu_svm *svm = to_svm(vcpu);
@@ -4593,6 +4598,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { 
	.check_apicv_inhibit_reasons = avic_check_apicv_inhibit_reasons,

	.apicv_post_state_restore = avic_apicv_post_state_restore,



	.get_mt_mask = svm_get_mt_mask,

	.get_exit_info = svm_get_exit_info,



	.vcpu_after_set_cpuid = svm_vcpu_after_set_cpuid,