Move the set_owner callback into irqchip_flow. It's not that useful an API anyway, and we should consider getting rid of it.
Signed-off-by: Marc Zyngier <[email protected]> --- arch/arm64/include/asm/kvm_irq.h | 4 ++++ arch/arm64/kvm/arch_timer.c | 4 ++-- arch/arm64/kvm/pmu-emul.c | 4 ++-- arch/arm64/kvm/vgic/vgic-init.c | 1 + arch/arm64/kvm/vgic/vgic.h | 1 + include/kvm/arm_vgic.h | 2 -- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/kvm_irq.h b/arch/arm64/include/asm/kvm_irq.h index 16556417bd4a..d1fc86b54f2d 100644 --- a/arch/arm64/include/asm/kvm_irq.h +++ b/arch/arm64/include/asm/kvm_irq.h @@ -38,6 +38,7 @@ struct kvm_irqchip_flow { int (*irqchip_map_phys_irq)(struct kvm_vcpu *, unsigned int, u32, bool (*)(int)); int (*irqchip_unmap_phys_irq)(struct kvm_vcpu *, unsigned int); + int (*irqchip_set_owner)(struct kvm_vcpu *, unsigned int, void *); }; /* @@ -114,4 +115,7 @@ struct kvm_irqchip_flow { #define kvm_irqchip_unmap_phys_irq(v, ...) \ __vcpu_irqchip_action_ret((v), unmap_phys_irq, (v), __VA_ARGS__) +#define kvm_irqchip_set_owner(v, ...) \ + __vcpu_irqchip_action_ret((v), set_owner, (v), __VA_ARGS__) + #endif diff --git a/arch/arm64/kvm/arch_timer.c b/arch/arm64/kvm/arch_timer.c index 16999de299a7..706fd0c63273 100644 --- a/arch/arm64/kvm/arch_timer.c +++ b/arch/arm64/kvm/arch_timer.c @@ -1083,12 +1083,12 @@ static bool timer_irqs_are_valid(struct kvm_vcpu *vcpu) int i, ret; vtimer_irq = vcpu_vtimer(vcpu)->irq.irq; - ret = kvm_vgic_set_owner(vcpu, vtimer_irq, vcpu_vtimer(vcpu)); + ret = kvm_irqchip_set_owner(vcpu, vtimer_irq, vcpu_vtimer(vcpu)); if (ret) return false; ptimer_irq = vcpu_ptimer(vcpu)->irq.irq; - ret = kvm_vgic_set_owner(vcpu, ptimer_irq, vcpu_ptimer(vcpu)); + ret = kvm_irqchip_set_owner(vcpu, ptimer_irq, vcpu_ptimer(vcpu)); if (ret) return false; diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c index f31ee6ad3444..d87f71845a64 100644 --- a/arch/arm64/kvm/pmu-emul.c +++ b/arch/arm64/kvm/pmu-emul.c @@ -758,8 +758,8 @@ static int kvm_arm_pmu_v3_init(struct kvm_vcpu *vcpu) if (!kvm_arm_pmu_irq_initialized(vcpu)) return -ENXIO; - ret = kvm_vgic_set_owner(vcpu, vcpu->arch.pmu.irq_num, - &vcpu->arch.pmu); + ret = kvm_irqchip_set_owner(vcpu, vcpu->arch.pmu.irq_num, + &vcpu->arch.pmu); if (ret) return ret; } diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c index ed62c0a27b53..6ace624b439d 100644 --- a/arch/arm64/kvm/vgic/vgic-init.c +++ b/arch/arm64/kvm/vgic/vgic-init.c @@ -33,6 +33,7 @@ static struct kvm_irqchip_flow vgic_irqchip_flow = { .irqchip_reset_mapped_irq = kvm_vgic_reset_mapped_irq, .irqchip_map_phys_irq = kvm_vgic_map_phys_irq, .irqchip_unmap_phys_irq = kvm_vgic_unmap_phys_irq, + .irqchip_set_owner = kvm_vgic_set_owner, }; /* diff --git a/arch/arm64/kvm/vgic/vgic.h b/arch/arm64/kvm/vgic/vgic.h index af4a0e5f31c1..c9e14a6cddf6 100644 --- a/arch/arm64/kvm/vgic/vgic.h +++ b/arch/arm64/kvm/vgic/vgic.h @@ -334,6 +334,7 @@ void kvm_vgic_reset_mapped_irq(struct kvm_vcpu *vcpu, u32 vintid); int kvm_vgic_map_phys_irq(struct kvm_vcpu *vcpu, unsigned int host_irq, u32 vintid, bool (*get_input_level)(int)); int kvm_vgic_unmap_phys_irq(struct kvm_vcpu *vcpu, unsigned int vintid); +int kvm_vgic_set_owner(struct kvm_vcpu *vcpu, unsigned int intid, void *owner); int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu); diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index ff8c49c0ebbd..f753110e24f9 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -362,8 +362,6 @@ static inline int kvm_vgic_get_max_vcpus(void) */ int kvm_vgic_setup_default_irq_routing(struct kvm *kvm); -int kvm_vgic_set_owner(struct kvm_vcpu *vcpu, unsigned int intid, void *owner); - struct kvm_kernel_irq_routing_entry; int kvm_vgic_v4_set_forwarding(struct kvm *kvm, int irq, -- 2.27.0 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
