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

Commit 1edccf20 authored by David Hildenbrand's avatar David Hildenbrand Committed by Greg Kroah-Hartman
Browse files

KVM: nVMX: vmx_complete_nested_posted_interrupt() can't fail 




(cherry picked from commit 6342c50ad12e8ce0736e722184a7dbdea4a3477f)

vmx_complete_nested_posted_interrupt() can't fail, let's turn it into
a void function.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19b1d4bd

arch/x86/kvm/vmx.c

+5 −5
Original line number Diff line number Diff line
@@ -4736,7 +4736,7 @@ static bool vmx_get_enable_apicv(void) 
	return enable_apicv;

}



static int vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu)

static void vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu)

{

	struct vcpu_vmx *vmx = to_vmx(vcpu);

	int max_irr;
@@ -4747,13 +4747,13 @@ static int vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu) 
	    vmx->nested.pi_pending) {

		vmx->nested.pi_pending = false;

		if (!pi_test_and_clear_on(vmx->nested.pi_desc))

			return 0;

			return;



		max_irr = find_last_bit(

			(unsigned long *)vmx->nested.pi_desc->pir, 256);



		if (max_irr == 256)

			return 0;

			return;



		vapic_page = kmap(vmx->nested.virtual_apic_page);

		__kvm_apic_update_irr(vmx->nested.pi_desc->pir, vapic_page);
@@ -4766,7 +4766,6 @@ static int vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu) 
			vmcs_write16(GUEST_INTR_STATUS, status);

		}

	}

	return 0;

}



static inline bool kvm_vcpu_trigger_posted_interrupt(struct kvm_vcpu *vcpu)
@@ -10482,7 +10481,8 @@ static int vmx_check_nested_events(struct kvm_vcpu *vcpu, bool external_intr) 
		return 0;

	}



	return vmx_complete_nested_posted_interrupt(vcpu);

	vmx_complete_nested_posted_interrupt(vcpu);

	return 0;

}



static u32 vmx_get_preemption_timer_value(struct kvm_vcpu *vcpu)