Commit 0191e92d authored by David Hildenbrand's avatar David Hildenbrand Committed by Radim Krčmář
Browse files

KVM: x86: get rid of ioapic_irqchip() 



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

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent 90bca052

arch/x86/kvm/ioapic.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

arch/x86/kvm/ioapic.h

+0 −5
Original line number Diff line number Diff line
@@ -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;