Commit 9e347ba0 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-riscv-fixes-6.3-1' of https://github.com/kvm-riscv/linux into HEAD 

KVM/riscv fixes for 6.3, take #1

- Fix VM hang in case of timer delta being zero
parents 8607daa2 6eff3804

arch/riscv/kvm/vcpu_timer.c

+2 −4
Original line number Diff line number Diff line
@@ -147,11 +147,9 @@ static void kvm_riscv_vcpu_timer_blocking(struct kvm_vcpu *vcpu) 
		return;



	delta_ns = kvm_riscv_delta_cycles2ns(t->next_cycles, gt, t);

	if (delta_ns) {

	hrtimer_start(&t->hrt, ktime_set(0, delta_ns), HRTIMER_MODE_REL);

	t->next_set = true;

}

}



static void kvm_riscv_vcpu_timer_unblocking(struct kvm_vcpu *vcpu)

{