Module Name: src
Committed By: jdolecek
Date: Thu Apr 9 14:39:10 UTC 2020
Modified Files:
src/sys/arch/amd64/conf: std.xen
src/sys/arch/i386/conf: XEN3PAE_DOM0 XEN3PAE_DOMU XEN3PAE_PVHVM
Added Files:
src/sys/arch/i386/conf: std.xen
src/sys/arch/xen/conf: std.xenversion
Removed Files:
src/sys/arch/xen/conf: std.xen
Log Message:
move xen/conf/std.xen to i386/conf/std.xen, it's i386-specific
split off __XEN_INTERFACE_VERSION__ to new xen/conf/std.xenversion
and use from both i386/conf/std.xen and amd64/conf/stf.xen, so that
there is single place for the definition
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/amd64/conf/std.xen
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/conf/XEN3PAE_DOMU
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/conf/XEN3PAE_PVHVM
cvs rdiff -u -r0 -r1.1 src/sys/arch/i386/conf/std.xen
cvs rdiff -u -r1.10 -r0 src/sys/arch/xen/conf/std.xen
cvs rdiff -u -r0 -r1.1 src/sys/arch/xen/conf/std.xenversion
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/std.xen
diff -u src/sys/arch/amd64/conf/std.xen:1.11 src/sys/arch/amd64/conf/std.xen:1.12
--- src/sys/arch/amd64/conf/std.xen:1.11 Mon Feb 4 18:14:53 2019
+++ src/sys/arch/amd64/conf/std.xen Thu Apr 9 14:39:10 2020
@@ -1,4 +1,4 @@
-# $NetBSD: std.xen,v 1.11 2019/02/04 18:14:53 cherry Exp $
+# $NetBSD: std.xen,v 1.12 2020/04/09 14:39:10 jdolecek Exp $
# NetBSD: std.i386,v 1.24 2003/02/26 21:33:36 fvdl Exp
#
# standard, required NetBSD/i386 'options'
@@ -7,8 +7,8 @@ machine xen amd64
include "conf/std" # MI standard options
options XEN #Xen support
-options __XEN_INTERFACE_VERSION__=0x00030208 # Xen 3.1 interface
-#options __XEN_INTERFACE_VERSION__=0x00030205 # Xen 3.1 interface
+
+include "arch/xen/conf/std.xenversion"
options CPU_IN_CKSUM
options EXEC_ELF64 # exec ELF binaries
Index: src/sys/arch/i386/conf/XEN3PAE_DOM0
diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.21 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.22
--- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.21 Wed Mar 25 17:06:19 2020
+++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Thu Apr 9 14:39:10 2020
@@ -1,8 +1,8 @@
-# $NetBSD: XEN3PAE_DOM0,v 1.21 2020/03/25 17:06:19 jdolecek Exp $
+# $NetBSD: XEN3PAE_DOM0,v 1.22 2020/04/09 14:39:10 jdolecek Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
-include "arch/xen/conf/std.xen"
+include "arch/i386/conf/std.xen"
options XENPV # PV dom0 support
#options MULTIPROCESSOR # (not yet - dom0 stuff is not MP-safe)
Index: src/sys/arch/i386/conf/XEN3PAE_DOMU
diff -u src/sys/arch/i386/conf/XEN3PAE_DOMU:1.8 src/sys/arch/i386/conf/XEN3PAE_DOMU:1.9
--- src/sys/arch/i386/conf/XEN3PAE_DOMU:1.8 Wed Mar 25 17:06:19 2020
+++ src/sys/arch/i386/conf/XEN3PAE_DOMU Thu Apr 9 14:39:10 2020
@@ -1,6 +1,6 @@
-# $NetBSD: XEN3PAE_DOMU,v 1.8 2020/03/25 17:06:19 jdolecek Exp $
+# $NetBSD: XEN3PAE_DOMU,v 1.9 2020/04/09 14:39:10 jdolecek Exp $
-include "arch/xen/conf/std.xen"
+include "arch/i386/conf/std.xen"
options XENPV # PV domU support
options MULTIPROCESSOR
Index: src/sys/arch/i386/conf/XEN3PAE_PVHVM
diff -u src/sys/arch/i386/conf/XEN3PAE_PVHVM:1.3 src/sys/arch/i386/conf/XEN3PAE_PVHVM:1.4
--- src/sys/arch/i386/conf/XEN3PAE_PVHVM:1.3 Mon Apr 6 19:28:21 2020
+++ src/sys/arch/i386/conf/XEN3PAE_PVHVM Thu Apr 9 14:39:10 2020
@@ -1,6 +1,6 @@
-# $NetBSD: XEN3PAE_PVHVM,v 1.3 2020/04/06 19:28:21 bouyer Exp $
+# $NetBSD: XEN3PAE_PVHVM,v 1.4 2020/04/09 14:39:10 jdolecek Exp $
-include "arch/xen/conf/std.xen"
+include "arch/i386/conf/std.xen"
options XENPVHVM # PVHVM domU support
Added files:
Index: src/sys/arch/i386/conf/std.xen
diff -u /dev/null src/sys/arch/i386/conf/std.xen:1.1
--- /dev/null Thu Apr 9 14:39:10 2020
+++ src/sys/arch/i386/conf/std.xen Thu Apr 9 14:39:10 2020
@@ -0,0 +1,25 @@
+# $NetBSD: std.xen,v 1.1 2020/04/09 14:39:10 jdolecek Exp $
+# NetBSD: std.i386,v 1.24 2003/02/26 21:33:36 fvdl Exp
+#
+# standard, required NetBSD/i386 'options'
+
+machine xen i386
+include "conf/std" # MI standard options
+
+include "arch/xen/conf/std.xenversion"
+
+options EXEC_AOUT # exec a.out binaries
+options EXEC_ELF32 # exec ELF binaries
+options EXEC_SCRIPT # exec #! scripts
+
+options CPU_IN_CKSUM
+#options CRYPTO_MD_DES_ENC # machine-dependent code for DES
+#options CRYPTO_MD_DES_CBC # machine-dependent DES CBC code
+#options CRYPTO_MD_BF_ENC # machine-dependent code for BF_encrypt
+#options CRYPTO_MD_BF_CBC # careful: uses bswapl, requires 486
+
+options CHILD_MAX=1024 # 160 is too few
+options OPEN_MAX=1024 # 128 is too few
+
+# Atheros HAL options
+include "external/isc/atheros_hal/conf/std.ath_hal"
Index: src/sys/arch/xen/conf/std.xenversion
diff -u /dev/null src/sys/arch/xen/conf/std.xenversion:1.1
--- /dev/null Thu Apr 9 14:39:10 2020
+++ src/sys/arch/xen/conf/std.xenversion Thu Apr 9 14:39:10 2020
@@ -0,0 +1,6 @@
+# $NetBSD: std.xenversion,v 1.1 2020/04/09 14:39:10 jdolecek Exp $
+#
+# Xen options shared for all archs (i386, amd64)
+
+options __XEN_INTERFACE_VERSION__=0x00030208 # Xen 3.1 interface
+
