From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Hildenbrand Subject: [PATCH RFC 06/21] KVM: x86: get rid of ioapic_irqchip() Date: Mon, 6 Mar 2017 14:18:00 +0100 Message-ID: <20170306131815.12033-7-david@redhat.com> References: <20170306131815.12033-1-david@redhat.com> Cc: Paolo Bonzini , rkrcmar@redhat.com, david@redhat.com To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:43580 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753322AbdCFNZa (ORCPT ); Mon, 6 Mar 2017 08:25:30 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9F4877E9CB for ; Mon, 6 Mar 2017 13:18:27 +0000 (UTC) In-Reply-To: <20170306131815.12033-1-david@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Let's just use kvm->arch.vioapic directly. Signed-off-by: David Hildenbrand --- arch/x86/kvm/ioapic.c | 4 ++-- 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 6e219e5..3d9dc98 100644 --- a/arch/x86/kvm/ioapic.c +++ b/arch/x86/kvm/ioapic.c @@ -643,7 +643,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; @@ -656,7 +656,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 9a62fe1..717d98a 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) { return kvm->arch.irqchip_mode == KVM_IRQCHIP_KERNEL; -- 2.9.3