openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: nVMX: vmx_complete_nested_posted_interrupt() can't fail 

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>
This commit is contained in:
David Hildenbrand 2017-01-25 11:58:58 +01:00 committed by Paolo Bonzini
parent 42cf014d38
commit 6342c50ad1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/kvm/vmx.c
View File

@ -4953,7 +4953,7 @@ static bool vmx_get_enable_apicv(void)
return enable_apicv; 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); struct vcpu_vmx *vmx = to_vmx(vcpu);
int max_irr; 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) {
vmx->nested.pi_pending = false; vmx->nested.pi_pending = false;
if (!pi_test_and_clear_on(vmx->nested.pi_desc)) if (!pi_test_and_clear_on(vmx->nested.pi_desc))
return 0; return;
max_irr = find_last_bit( max_irr = find_last_bit(
(unsigned long *)vmx->nested.pi_desc->pir, 256); (unsigned long *)vmx->nested.pi_desc->pir, 256);
if (max_irr == 256) if (max_irr == 256)
return 0; return;
vapic_page = kmap(vmx->nested.virtual_apic_page); vapic_page = kmap(vmx->nested.virtual_apic_page);
__kvm_apic_update_irr(vmx->nested.pi_desc->pir, vapic_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); vmcs_write16(GUEST_INTR_STATUS, status);
} }
} }
return 0;
} }
static inline bool kvm_vcpu_trigger_posted_interrupt(struct kvm_vcpu *vcpu) 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 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) static u32 vmx_get_preemption_timer_value(struct kvm_vcpu *vcpu)