]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
KVM: nVMX: vmx_complete_nested_posted_interrupt() can't fail
authorDavid Hildenbrand <david@redhat.com>
Wed, 25 Jan 2017 10:58:58 +0000 (11:58 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 7 Feb 2017 17:16:44 +0000 (18:16 +0100)
vmx_complete_nested_posted_interrupt() can't fail, let's turn it into
a void function.

Signed-off-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/vmx.c

index 693e4203b666592a122c682ffa771792de77859d..7c3e42623090593c720598ca7812931f156ba3da 100644 (file)
@@ -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)