Commit a61353ac authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini

KVM: x86: Rename kvm_apic_has_events() to make it INIT/SIPI specific

Rename kvm_apic_has_events() to kvm_apic_has_pending_init_or_sipi() so
that it's more obvious that "events" really just means "INIT or SIPI".

Opportunistically clean up a weirdly worded comment that referenced
kvm_apic_has_events() instead of kvm_apic_accept_events().

No functional change intended.
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20220921003201.1441511-5-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1b7a1b78
...@@ -224,7 +224,7 @@ static inline bool kvm_vcpu_apicv_active(struct kvm_vcpu *vcpu) ...@@ -224,7 +224,7 @@ static inline bool kvm_vcpu_apicv_active(struct kvm_vcpu *vcpu)
return lapic_in_kernel(vcpu) && vcpu->arch.apic->apicv_active; return lapic_in_kernel(vcpu) && vcpu->arch.apic->apicv_active;
} }
static inline bool kvm_apic_has_events(struct kvm_vcpu *vcpu) static inline bool kvm_apic_has_pending_init_or_sipi(struct kvm_vcpu *vcpu)
{ {
return lapic_in_kernel(vcpu) && vcpu->arch.apic->pending_events; return lapic_in_kernel(vcpu) && vcpu->arch.apic->pending_events;
} }
......
...@@ -11922,8 +11922,8 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) ...@@ -11922,8 +11922,8 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
struct fpstate *fpstate = vcpu->arch.guest_fpu.fpstate; struct fpstate *fpstate = vcpu->arch.guest_fpu.fpstate;
/* /*
* To avoid have the INIT path from kvm_apic_has_events() that be * All paths that lead to INIT are required to load the guest's
* called with loaded FPU and does not let userspace fix the state. * FPU state (because most paths are buried in KVM_RUN).
*/ */
if (init_event) if (init_event)
kvm_put_guest_fpu(vcpu); kvm_put_guest_fpu(vcpu);
...@@ -12767,7 +12767,7 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu) ...@@ -12767,7 +12767,7 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu)
if (!list_empty_careful(&vcpu->async_pf.done)) if (!list_empty_careful(&vcpu->async_pf.done))
return true; return true;
if (kvm_apic_has_events(vcpu)) if (kvm_apic_has_pending_init_or_sipi(vcpu))
return true; return true;
if (vcpu->arch.pv.pv_unhalted) if (vcpu->arch.pv.pv_unhalted)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment