Module Name: src
Committed By: bouyer
Date: Sat May 9 08:01:38 UTC 2020
Modified Files:
src/sys/arch/xen/xen: hypervisor.c
Log Message:
Also set x86_delay to xen_delay, unbreaks PVH
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/xen/xen/hypervisor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/hypervisor.c
diff -u src/sys/arch/xen/xen/hypervisor.c:1.83 src/sys/arch/xen/xen/hypervisor.c:1.84
--- src/sys/arch/xen/xen/hypervisor.c:1.83 Fri May 8 17:28:33 2020
+++ src/sys/arch/xen/xen/hypervisor.c Sat May 9 08:01:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.83 2020/05/08 17:28:33 bouyer Exp $ */
+/* $NetBSD: hypervisor.c,v 1.84 2020/05/09 08:01:38 bouyer Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -53,7 +53,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.83 2020/05/08 17:28:33 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.84 2020/05/09 08:01:38 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -258,7 +258,7 @@ init_xen_early(void)
printk(
"Xen HVM: Unable to register HYPERVISOR_shared_info %d\n", err);
}
- delay_func = xen_delay;
+ delay_func = x86_delay = xen_delay;
x86_initclock_func = xen_initclocks;
x86_cpu_initclock_func = xen_cpu_initclocks;
if (hvm_start_info->cmdline_paddr != 0) {
@@ -434,7 +434,7 @@ xen_hvm_init(void)
xen_start_info.console.domU.evtchn = xen_hvm_param.value;
- delay_func = xen_delay;
+ delay_func = x86_delay = xen_delay;
x86_initclock_func = xen_initclocks;
x86_cpu_initclock_func = xen_cpu_initclocks;
