KVM: nVMX: vmx_complete_nested_posted_interrupt() can't fail

davidhildenbrand · bonzini · commit 6342c50ad12e · 2017-02-07T18:16:44.000+01:00
vmx_complete_nested_posted_interrupt() can't fail, let's turn it into
a void function.

Signed-off-by: David Hildenbrand &lt;david@redhat.com&gt;
Signed-off-by: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
@@ -4953,7 +4953,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;
@@ -4964,13 +4964,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);
@@ -4983,7 +4983,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)
@@ -10695,7 +10694,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)

Original file line number	Diff line number	Diff line change
`@@ -4953,7 +4953,7 @@ static bool vmx_get_enable_apicv(void)`
`4953`	`4953`	`return enable_apicv;`
`4954`	`4954`	`}`
`4955`	`4955`
`4956`		`-static int vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu)`
	`4956`	`+static void vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu)`
`4957`	`4957`	`{`
`4958`	`4958`	`struct vcpu_vmx *vmx = to_vmx(vcpu);`
`4959`	`4959`	`int max_irr;`
`@@ -4964,13 +4964,13 @@ static int vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu)`
`4964`	`4964`	`vmx->nested.pi_pending) {`
`4965`	`4965`	`vmx->nested.pi_pending = false;`
`4966`	`4966`	`if (!pi_test_and_clear_on(vmx->nested.pi_desc))`
`4967`		`- return 0;`
	`4967`	`+ return;`
`4968`	`4968`
`4969`	`4969`	`max_irr = find_last_bit(`
`4970`	`4970`	`(unsigned long *)vmx->nested.pi_desc->pir, 256);`
`4971`	`4971`
`4972`	`4972`	`if (max_irr == 256)`
`4973`		`- return 0;`
	`4973`	`+ return;`
`4974`	`4974`
`4975`	`4975`	`vapic_page = kmap(vmx->nested.virtual_apic_page);`
`4976`	`4976`	`__kvm_apic_update_irr(vmx->nested.pi_desc->pir, vapic_page);`
`@@ -4983,7 +4983,6 @@ static int vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu)`
`4983`	`4983`	`vmcs_write16(GUEST_INTR_STATUS, status);`
`4984`	`4984`	`}`
`4985`	`4985`	`}`
`4986`		`- return 0;`
`4987`	`4986`	`}`
`4988`	`4987`
`4989`	`4988`	`static inline bool kvm_vcpu_trigger_posted_interrupt(struct kvm_vcpu *vcpu)`
`@@ -10695,7 +10694,8 @@ static int vmx_check_nested_events(struct kvm_vcpu *vcpu, bool external_intr)`
`10695`	`10694`	`return 0;`
`10696`	`10695`	`}`
`10697`	`10696`
`10698`		`- return vmx_complete_nested_posted_interrupt(vcpu);`
	`10697`	`+ vmx_complete_nested_posted_interrupt(vcpu);`
	`10698`	`+ return 0;`
`10699`	`10699`	`}`
`10700`	`10700`
`10701`	`10701`	`static u32 vmx_get_preemption_timer_value(struct kvm_vcpu *vcpu)`