[PATCH 6/5] KVM: arm/arm64: make kvm_vgic_vcpu_pending_irq static

Andrew Jones
2017-10-02T08:31:24Z

Now that the only caller of kvm_vgic_vcpu_pending_irq() is in the
vgic code, let's make it private in order to discourage it's use
outside, as checking the IRQ_PENDING VCPU request is likely the
right thing for non-vgic code to do. Also, remove a vgic prototype
that was mistakenly introduced with 0919e84c0fc1, and along for the
ride ever since.

Signed-off-by: Andrew Jones <drjones@redhat.com>
---
include/kvm/arm_vgic.h | 3 ---
virt/kvm/arm/vgic/vgic.c | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index 34dba516ef24..aade132d2a30 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -311,8 +311,6 @@ int kvm_vgic_map_phys_irq(struct kvm_vcpu *vcpu, u32 virt_irq, u32 phys_irq);
int kvm_vgic_unmap_phys_irq(struct kvm_vcpu *vcpu, unsigned int virt_irq);
bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, unsigned int virt_irq);

-int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu);
-
void kvm_vgic_load(struct kvm_vcpu *vcpu);
void kvm_vgic_put(struct kvm_vcpu *vcpu);

@@ -322,7 +320,6 @@ void kvm_vgic_put(struct kvm_vcpu *vcpu);
#define vgic_valid_spi(k, i) (((i) >= VGIC_NR_PRIVATE_IRQS) && \
((i) < (k)->arch.vgic.nr_spis + VGIC_NR_PRIVATE_IRQS))

-bool kvm_vcpu_has_pending_irqs(struct kvm_vcpu *vcpu);
void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu);
void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu);

diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c
index fed717e07938..72a16259beec 100644
--- a/virt/kvm/arm/vgic/vgic.c
+++ b/virt/kvm/arm/vgic/vgic.c
@@ -730,7 +730,7 @@ void kvm_vgic_put(struct kvm_vcpu *vcpu)
vgic_v3_put(vcpu);
}

-int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu)
+static int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu)
{
struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
struct vgic_irq *irq;
--
2.13.5