Salut Eric, On 21/04/16 18:56, Eric Auger wrote: > On 04/15/2016 04:04 PM, Andre Przywara wrote: >> Now that the interface between the arch timer and the VGIC does not >> require passing the irq_phys_map entry pointer anymore, let's remove >> it from the virtual arch timer and use the virtual IRQ number instead >> directly. >> The remaining pointer returned by kvm_vgic_map_phys_irq() will be >> removed in the following patch. >> >> Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx> >> --- >> include/kvm/arm_arch_timer.h | 4 ++-- >> virt/kvm/arm/arch_timer.c | 12 ++++++------ >> 2 files changed, 8 insertions(+), 8 deletions(-) >> >> diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h >> index b651aed..1ed70f6 100644 >> --- a/include/kvm/arm_arch_timer.h >> +++ b/include/kvm/arm_arch_timer.h >> @@ -53,8 +53,8 @@ struct arch_timer_cpu { >> /* Timer IRQ */ >> struct kvm_irq_level irq; >> >> - /* VGIC mapping */ >> - struct irq_phys_map *map; >> + /* The virtual IRQ number */ >> + unsigned int virt_irq; > what's the difference between irq.irq and virt_irq? aren't they duplicates? As I found out already for myself: nothing. I think I will remove virt_irq and use irq.irq instead everywhere. >> >> /* Active IRQ state caching */ >> bool active_cleared_last; >> diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c >> index cfdf88f..1598e23 100644 >> --- a/virt/kvm/arm/arch_timer.c >> +++ b/virt/kvm/arm/arch_timer.c >> @@ -137,10 +137,10 @@ static void kvm_timer_update_irq(struct kvm_vcpu *vcpu, bool new_level) >> >> timer->active_cleared_last = false; >> timer->irq.level = new_level; >> - trace_kvm_timer_update_irq(vcpu->vcpu_id, timer->map->virt_irq, >> + trace_kvm_timer_update_irq(vcpu->vcpu_id, timer->virt_irq, >> timer->irq.level); >> ret = kvm_vgic_inject_mapped_irq(vcpu->kvm, vcpu->vcpu_id, >> - timer->map->virt_irq, >> + timer->virt_irq, >> timer->irq.level); >> WARN_ON(ret); >> } >> @@ -246,7 +246,7 @@ void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu) >> * to ensure that hardware interrupts from the timer triggers a guest >> * exit. >> */ >> - if (timer->irq.level || kvm_vgic_map_is_active(vcpu, timer->map->virt_irq)) >> + if (timer->irq.level || kvm_vgic_map_is_active(vcpu, timer->virt_irq)) >> phys_active = true; >> else >> phys_active = false; >> @@ -351,7 +351,7 @@ int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, >> if (WARN_ON(IS_ERR(map))) >> return PTR_ERR(map); >> >> - timer->map = map; >> + timer->virt_irq = irq->irq; > you also have a duplicate above: > timer->irq.irq = irq->irq; >> return 0; >> } >> >> @@ -494,8 +494,8 @@ void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu) >> struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; >> >> timer_disarm(timer); >> - if (timer->map) >> - kvm_vgic_unmap_phys_irq(vcpu, timer->map->virt_irq); >> + if (timer->virt_irq) >> + kvm_vgic_unmap_phys_irq(vcpu, timer->virt_irq); > always unmap? Yeah, makes sense. Thanks! Andre >> } >> >> void kvm_timer_enable(struct kvm *kvm) >> > -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html