Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- qemu_hardclock(): fix check for spurious hardclock call.

Browse Source 
- qemu_clock_init(): Initialize qemu_nsec_per_tick *after* adjusting hz.
  Error pointed out by Jonathan Kollasch.
This commit is contained in:
thorpej 2020-10-07 14:07:42 +00:00
parent dbe4bf45a3
commit 0595de54a5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/alpha/alpha/qemu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: qemu.c,v 1.3 2020/10/03 17:32:49 thorpej Exp $ */
/* $NetBSD: qemu.c,v 1.4 2020/10/07 14:07:42 thorpej Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@ -121,7 +121,7 @@ qemu_set_alarm_relative(unsigned long nsec)
static void
qemu_hardclock(struct clockframe * const framep)
{
if (__predict_false(qemu_nsec_per_tick == 0)) {
if (__predict_false(qemu_nsec_per_tick == (unsigned long)-1)) {
/* Spurious; qemu_clock_init() hasn't been called yet. */
return;
}
@ -138,7 +138,6 @@ qemu_clock_init(void * const v __unused)
/* First-time initialization... */
if (qemu_nsec_per_tick == (unsigned long)-1) {
KASSERT(CPU_IS_PRIMARY(curcpu()));
qemu_nsec_per_tick = 1000000000UL / hz;
/*
* Override the clockintr routine; the Qemu alarm is
@ -157,6 +156,8 @@ qemu_clock_init(void * const v __unused)
tickadj = (240000 / (60 * hz)) ? (240000 / (60 * hz)) : 1;
schedhz = 0;
qemu_nsec_per_tick = 1000000000UL / hz;
printf("Using the Qemu CPU alarm for %d Hz hardclock.\n", hz);
}