Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fcdb510 authored by Joerg Roedel's avatar Joerg Roedel Committed by Avi Kivity
Browse files

KVM: SVM: reorganize svm_interrupt_allowed 



This patch reorganizes the logic in svm_interrupt_allowed to
make it better to read. This is important because the logic
is a lot more complicated with Nested SVM.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent bfc33bea

arch/x86/kvm/svm.c

+12 −4
Original line number Diff line number Diff line
@@ -2472,10 +2472,18 @@ static int svm_interrupt_allowed(struct kvm_vcpu *vcpu) 
{

	struct vcpu_svm *svm = to_svm(vcpu);

	struct vmcb *vmcb = svm->vmcb;

	return (vmcb->save.rflags & X86_EFLAGS_IF) &&

		!(vmcb->control.int_state & SVM_INTERRUPT_SHADOW_MASK) &&

		gif_set(svm) &&

		!(is_nested(svm) && (svm->vcpu.arch.hflags & HF_VINTR_MASK));

	int ret;



	if (!gif_set(svm) ||

	     (vmcb->control.int_state & SVM_INTERRUPT_SHADOW_MASK))

		return 0;



	ret = !!(vmcb->save.rflags & X86_EFLAGS_IF);



	if (is_nested(svm))

		return ret && !(svm->vcpu.arch.hflags & HF_VINTR_MASK);



	return ret;

}



static void enable_irq_window(struct kvm_vcpu *vcpu)