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

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
...@@ -147,10 +147,8 @@ static void kvm_riscv_vcpu_timer_blocking(struct kvm_vcpu *vcpu) ...@@ -147,10 +147,8 @@ static void kvm_riscv_vcpu_timer_blocking(struct kvm_vcpu *vcpu)
return; return;
delta_ns = kvm_riscv_delta_cycles2ns(t->next_cycles, gt, t); 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);
hrtimer_start(&t->hrt, ktime_set(0, delta_ns), HRTIMER_MODE_REL); t->next_set = true;
t->next_set = true;
}
} }
static void kvm_riscv_vcpu_timer_unblocking(struct kvm_vcpu *vcpu) static void kvm_riscv_vcpu_timer_unblocking(struct kvm_vcpu *vcpu)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment