Skip to content

Commit 9e347ba

Browse files
committed
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
2 parents 8607daa + 6eff380 commit 9e347ba

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

arch/riscv/kvm/vcpu_timer.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,8 @@ static void kvm_riscv_vcpu_timer_blocking(struct kvm_vcpu *vcpu)
147147
return;
148148

149149
delta_ns = kvm_riscv_delta_cycles2ns(t->next_cycles, gt, t);
150-
if (delta_ns) {
151-
hrtimer_start(&t->hrt, ktime_set(0, delta_ns), HRTIMER_MODE_REL);
152-
t->next_set = true;
153-
}
150+
hrtimer_start(&t->hrt, ktime_set(0, delta_ns), HRTIMER_MODE_REL);
151+
t->next_set = true;
154152
}
155153

156154
static void kvm_riscv_vcpu_timer_unblocking(struct kvm_vcpu *vcpu)

0 commit comments

Comments
 (0)