KVM: x86: get rid of ioapic_irqchip()

Let's just use kvm->arch.vioapic directly.

Signed-off-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>

diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c
index 289270a6aecbb478ea14cc786c72fcfdf5058350..a433317d57872b79c63dfa5ee46ed162b2756505 100644 (file)
--- a/arch/x86/kvm/ioapic.c
+++ b/arch/x86/kvm/ioapic.c
@@ -646,7 +646,7 @@ void kvm_ioapic_destroy(struct kvm *kvm)
 
 int kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state)
 {
-       struct kvm_ioapic *ioapic = ioapic_irqchip(kvm);
+       struct kvm_ioapic *ioapic = kvm->arch.vioapic;
        if (!ioapic)
                return -EINVAL;
 
@@ -659,7 +659,7 @@ int kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state)
 
 int kvm_set_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state)
 {
-       struct kvm_ioapic *ioapic = ioapic_irqchip(kvm);
+       struct kvm_ioapic *ioapic = kvm->arch.vioapic;
        if (!ioapic)
                return -EINVAL;
 

diff --git a/arch/x86/kvm/ioapic.h b/arch/x86/kvm/ioapic.h
index d88e4b9aa1510e1b1e1f313fd3de6bbcf44c6d0b..5a1de923064270f8155a9994b0705c0da0ec0902 100644 (file)
--- a/arch/x86/kvm/ioapic.h
+++ b/arch/x86/kvm/ioapic.h
@@ -105,11 +105,6 @@ do {                                                                       \
 #define ASSERT(x) do { } while (0)
 #endif
 
-static inline struct kvm_ioapic *ioapic_irqchip(struct kvm *kvm)
-{
-       return kvm->arch.vioapic;
-}
-
 static inline int ioapic_in_kernel(struct kvm *kvm)
 {
        int mode = kvm->arch.irqchip_mode;