diff options
Diffstat (limited to 'virt/kvm/arm/arch_timer.c')
| -rw-r--r-- | virt/kvm/arm/arch_timer.c | 6 | 
1 files changed, 5 insertions, 1 deletions
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index 70f4c30918eb..282389eb204f 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -581,6 +581,7 @@ void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu)  int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu)  { +	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;  	struct arch_timer_context *vtimer = vcpu_vtimer(vcpu);  	struct arch_timer_context *ptimer = vcpu_ptimer(vcpu); @@ -594,6 +595,9 @@ int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu)  	ptimer->cnt_ctl = 0;  	kvm_timer_update_state(vcpu); +	if (timer->enabled && irqchip_in_kernel(vcpu->kvm)) +		kvm_vgic_reset_mapped_irq(vcpu, vtimer->irq.irq); +  	return 0;  } @@ -767,7 +771,7 @@ int kvm_timer_hyp_init(bool has_gic)  		static_branch_enable(&has_gic_active_state);  	} -	kvm_info("virtual timer IRQ%d\n", host_vtimer_irq); +	kvm_debug("virtual timer IRQ%d\n", host_vtimer_irq);  	cpuhp_setup_state(CPUHP_AP_KVM_ARM_TIMER_STARTING,  			  "kvm/arm/timer:starting", kvm_timer_starting_cpu,  | 
