diff options
| author | David Hildenbrand <david@redhat.com> | 2017-04-07 10:50:24 +0200 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-04-12 20:17:13 +0200 |
| commit | 0191e92d84eefe6522a4546b0dfb69393835b168 (patch) | |
| tree | 414f808549114757e97ea3885416cc5789f91fbc | |
| parent | 90bca0529e1bc94fd36659217603e8a1c3f9ad83 (diff) | |
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>
| -rw-r--r-- | arch/x86/kvm/ioapic.c | 4 | ||||
| -rw-r--r-- | arch/x86/kvm/ioapic.h | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c index 289270a6aecb..a433317d5787 100644 --- 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 d88e4b9aa151..5a1de9230642 100644 --- 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; |