@@ -739,12 +739,14 @@ static bool pv_eoi_test_and_clr_pending(struct kvm_vcpu *vcpu)
static int apic_has_interrupt_for_ppr(struct kvm_lapic *apic, u32 ppr)
{
int highest_irr;
+
if (kvm_x86_ops.sync_pir_to_irr)
highest_irr = static_call(kvm_x86_sync_pir_to_irr)(apic->vcpu);
else
highest_irr = apic_find_highest_irr(apic);
if (highest_irr == -1 || (highest_irr & 0xF0) <= ppr)
return -1;
+
return highest_irr;
}
@@ -932,6 +934,7 @@ static bool kvm_apic_is_broadcast_dest(struct kvm *kvm, struct kvm_lapic **src,
return true;
} else {
bool x2apic_ipi = src && *src && apic_x2apic_mode(*src);
+
if (irq->dest_id == (x2apic_ipi ?
X2APIC_BROADCAST : APIC_BROADCAST))
return true;
The function apic_has_interrupt_for_ppr and the function kvm_apic_is_broadcast_dest should follow the same style as other codes. Signed-off-by: Deming Wang <wangdeming@inspur.com> --- arch/x86/kvm/lapic.c | 3 +++ 1 file changed, 3 insertions(+)