Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0191e92d authored Apr 07, 2017 by David Hildenbrand Committed by Radim Krčmář Apr 12, 2017

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>

parent 90bca052

arch/x86/kvm/ioapic.c

+2 −2

Original line number	Original line	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)		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)		if (!ioapic)
	return -EINVAL;		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)		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)		if (!ioapic)
	return -EINVAL;		return -EINVAL;

arch/x86/kvm/ioapic.h

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -105,11 +105,6 @@ do { \
	#define ASSERT(x) do { } while (0)		#define ASSERT(x) do { } while (0)
	#endif		#endif

	static inline struct kvm_ioapic ioapic_irqchip(struct kvm kvm)
	{
	return kvm->arch.vioapic;
	}

	static inline int ioapic_in_kernel(struct kvm *kvm)		static inline int ioapic_in_kernel(struct kvm *kvm)
	{		{
	int mode = kvm->arch.irqchip_mode;		int mode = kvm->arch.irqchip_mode;