Module Name: src
Committed By: riastradh
Date: Sat Aug 5 14:38:43 UTC 2023
Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0 XEN3_DOMU
src/sys/arch/i386/conf: XEN3PAE_DOM0 XEN3PAE_DOMU
Log Message:
xen/x86: Enable heartbeat checks.
To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/i386/conf/XEN3PAE_DOMU
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/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.198 src/sys/arch/amd64/conf/XEN3_DOM0:1.199
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.198 Thu Feb 9 14:09:48 2023
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Aug 5 14:38:43 2023
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.198 2023/02/09 14:09:48 abs Exp $
+# $NetBSD: XEN3_DOM0,v 1.199 2023/08/05 14:38:43 riastradh Exp $
# XEN3_DOM0 machine description file
#
@@ -14,7 +14,7 @@ include "arch/amd64/conf/std.xen"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "XEN3_DOM0-$Revision: 1.198 $"
+#ident "XEN3_DOM0-$Revision: 1.199 $"
maxusers 32 # estimated number of users
@@ -166,6 +166,10 @@ options KDTRACE_HOOKS # kernel DTrace h
# Fault Injection Driver.
#options FAULT
+# Heartbeat checks
+options HEARTBEAT
+options HEARTBEAT_MAX_PERIOD_DEFAULT=15
+
# Compatibility options
# x86_64 never shipped with a.out binaries; the two options below are
# only relevant to 32-bit i386 binaries
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.102 src/sys/arch/amd64/conf/XEN3_DOMU:1.103
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.102 Sat Jul 22 15:18:48 2023
+++ src/sys/arch/amd64/conf/XEN3_DOMU Sat Aug 5 14:38:43 2023
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.102 2023/07/22 15:18:48 riastradh Exp $
+# $NetBSD: XEN3_DOMU,v 1.103 2023/08/05 14:38:43 riastradh Exp $
include "arch/amd64/conf/std.xen"
@@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOMU-$Revision: 1.102 $"
+#ident "XEN3_DOMU-$Revision: 1.103 $"
maxusers 32 # estimated number of users
@@ -56,6 +56,10 @@ makeoptions COPTS="-O2 -fno-omit-frame-p
options DDB_COMMANDONENTER="trace;show registers"
options KDTRACE_HOOKS # kernel DTrace hooks
+# Heartbeat checks
+options HEARTBEAT
+options HEARTBEAT_MAX_PERIOD_DEFAULT=15
+
# Compatibility options
include "conf/compat_netbsd15.config"
#options COMPAT_386BSD_MBRPART # recognize old partition ID
Index: src/sys/arch/i386/conf/XEN3PAE_DOM0
diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.39 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.40
--- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.39 Sat Jul 22 15:19:03 2023
+++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Sat Aug 5 14:38:43 2023
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOM0,v 1.39 2023/07/22 15:19:03 riastradh Exp $
+# $NetBSD: XEN3PAE_DOM0,v 1.40 2023/08/05 14:38:43 riastradh Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -78,6 +78,10 @@ makeoptions DEBUG="-g" # compile full sy
options DDB_COMMANDONENTER="show registers"
options KDTRACE_HOOKS # kernel DTrace hooks
+# Heartbeat checks
+options HEARTBEAT
+options HEARTBEAT_MAX_PERIOD_DEFAULT=15
+
# Compatibility options
include "conf/compat_netbsd09.config"
options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI
Index: src/sys/arch/i386/conf/XEN3PAE_DOMU
diff -u src/sys/arch/i386/conf/XEN3PAE_DOMU:1.21 src/sys/arch/i386/conf/XEN3PAE_DOMU:1.22
--- src/sys/arch/i386/conf/XEN3PAE_DOMU:1.21 Sat Jul 22 15:19:17 2023
+++ src/sys/arch/i386/conf/XEN3PAE_DOMU Sat Aug 5 14:38:43 2023
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOMU,v 1.21 2023/07/22 15:19:17 riastradh Exp $
+# $NetBSD: XEN3PAE_DOMU,v 1.22 2023/08/05 14:38:43 riastradh Exp $
include "arch/i386/conf/std.xen"
@@ -62,6 +62,10 @@ makeoptions DEBUG="-g" # compile full sy
options DDB_COMMANDONENTER="trace;show registers"
options KDTRACE_HOOKS # kernel DTrace hooks
+# Heartbeat checks
+options HEARTBEAT
+options HEARTBEAT_MAX_PERIOD_DEFAULT=15
+
# Compatibility options
include "conf/compat_netbsd09.config"
options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI