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

Commit 2505dc9f authored by Jan Kiszka's avatar Jan Kiszka Committed by Gleb Natapov
Browse files

KVM: VMX: Move vmx_nmi_allowed after vmx_set_nmi_mask 



vmx_set_nmi_mask will soon be used by vmx_nmi_allowed. No functional
changes.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
parent 27469d29

arch/x86/kvm/vmx.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -4486,16 +4486,6 @@ static void vmx_inject_nmi(struct kvm_vcpu *vcpu) 
			INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK | NMI_VECTOR);

			INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK | NMI_VECTOR);

}

}





static int vmx_nmi_allowed(struct kvm_vcpu *vcpu)

{

	if (!cpu_has_virtual_nmis() && to_vmx(vcpu)->soft_vnmi_blocked)

		return 0;



	return	!(vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) &

		  (GUEST_INTR_STATE_MOV_SS | GUEST_INTR_STATE_STI

		   | GUEST_INTR_STATE_NMI));

}



static bool vmx_get_nmi_mask(struct kvm_vcpu *vcpu)

static bool vmx_get_nmi_mask(struct kvm_vcpu *vcpu)

{

{

	if (!cpu_has_virtual_nmis())

	if (!cpu_has_virtual_nmis())
@@ -4525,6 +4515,16 @@ static void vmx_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked) 
	}

	}

}

}





static int vmx_nmi_allowed(struct kvm_vcpu *vcpu)

{

	if (!cpu_has_virtual_nmis() && to_vmx(vcpu)->soft_vnmi_blocked)

		return 0;



	return	!(vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) &

		  (GUEST_INTR_STATE_MOV_SS | GUEST_INTR_STATE_STI

		   | GUEST_INTR_STATE_NMI));

}



static int vmx_interrupt_allowed(struct kvm_vcpu *vcpu)

static int vmx_interrupt_allowed(struct kvm_vcpu *vcpu)

{

{

	if (is_guest_mode(vcpu)) {

	if (is_guest_mode(vcpu)) {