From: Yang Zhang <[email protected]> RTC interrupt coalesced need to parse ioapic entry to get destionation vcpu too. Rename it to more common name.
Signed-off-by: Yang Zhang <[email protected]> --- arch/x86/kvm/lapic.c | 2 +- virt/kvm/ioapic.c | 6 +++--- virt/kvm/ioapic.h | 2 +- virt/kvm/irq_comm.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index b4339a5..12179b3 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -264,7 +264,7 @@ out: if (old) kfree_rcu(old, rcu); - kvm_ioapic_make_eoibitmap_request(kvm); + kvm_scan_ioapic_entry(kvm); } static inline void kvm_apic_set_id(struct kvm_lapic *apic, u8 id) diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index ce82b94..d087e07 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c @@ -143,7 +143,7 @@ void kvm_ioapic_calculate_eoi_exitmap(struct kvm_vcpu *vcpu, } EXPORT_SYMBOL_GPL(kvm_ioapic_calculate_eoi_exitmap); -void kvm_ioapic_make_eoibitmap_request(struct kvm *kvm) +void kvm_scan_ioapic_entry(struct kvm *kvm) { struct kvm_ioapic *ioapic = kvm->arch.vioapic; @@ -193,7 +193,7 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val) if (e->fields.trig_mode == IOAPIC_LEVEL_TRIG && ioapic->irr & (1 << index)) ioapic_service(ioapic, index); - kvm_ioapic_make_eoibitmap_request(ioapic->kvm); + kvm_scan_ioapic_entry(ioapic->kvm); break; } } @@ -493,7 +493,7 @@ int kvm_set_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state) spin_lock(&ioapic->lock); memcpy(ioapic, state, sizeof(struct kvm_ioapic_state)); update_handled_vectors(ioapic); - kvm_ioapic_make_eoibitmap_request(kvm); + kvm_scan_ioapic_entry(kvm); spin_unlock(&ioapic->lock); return 0; } diff --git a/virt/kvm/ioapic.h b/virt/kvm/ioapic.h index 0400a46..cebc123 100644 --- a/virt/kvm/ioapic.h +++ b/virt/kvm/ioapic.h @@ -82,7 +82,7 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, struct kvm_lapic_irq *irq); int kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state); int kvm_set_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state); -void kvm_ioapic_make_eoibitmap_request(struct kvm *kvm); +void kvm_scan_ioapic_entry(struct kvm *kvm); void kvm_ioapic_calculate_eoi_exitmap(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap); diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c index ff6d40e..15de3b7 100644 --- a/virt/kvm/irq_comm.c +++ b/virt/kvm/irq_comm.c @@ -284,7 +284,7 @@ void kvm_register_irq_ack_notifier(struct kvm *kvm, mutex_lock(&kvm->irq_lock); hlist_add_head_rcu(&kian->link, &kvm->irq_ack_notifier_list); mutex_unlock(&kvm->irq_lock); - kvm_ioapic_make_eoibitmap_request(kvm); + kvm_scan_ioapic_entry(kvm); } void kvm_unregister_irq_ack_notifier(struct kvm *kvm, @@ -294,7 +294,7 @@ void kvm_unregister_irq_ack_notifier(struct kvm *kvm, hlist_del_init_rcu(&kian->link); mutex_unlock(&kvm->irq_lock); synchronize_rcu(); - kvm_ioapic_make_eoibitmap_request(kvm); + kvm_scan_ioapic_entry(kvm); } int kvm_request_irq_source_id(struct kvm *kvm) -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
