Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch move xen/conf/std.xen to i386/conf/std.xen, it's i3...



details:   https://anonhg.NetBSD.org/src/rev/cd1bc7cd60eb
branches:  trunk
changeset: 1009013:cd1bc7cd60eb
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Thu Apr 09 14:39:10 2020 +0000

description:
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

diffstat:

 sys/arch/amd64/conf/std.xen      |   6 +++---
 sys/arch/i386/conf/XEN3PAE_DOM0  |   4 ++--
 sys/arch/i386/conf/XEN3PAE_DOMU  |   4 ++--
 sys/arch/i386/conf/XEN3PAE_PVHVM |   4 ++--
 sys/arch/i386/conf/std.xen       |  25 +++++++++++++++++++++++++
 sys/arch/xen/conf/std.xen        |  25 -------------------------
 sys/arch/xen/conf/std.xenversion |   6 ++++++
 7 files changed, 40 insertions(+), 34 deletions(-)

diffs (126 lines):

diff -r 08b8fdc1ba57 -r cd1bc7cd60eb sys/arch/amd64/conf/std.xen
--- a/sys/arch/amd64/conf/std.xen       Thu Apr 09 11:10:07 2020 +0000
+++ b/sys/arch/amd64/conf/std.xen       Thu Apr 09 14:39:10 2020 +0000
@@ -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 @@
 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
diff -r 08b8fdc1ba57 -r cd1bc7cd60eb sys/arch/i386/conf/XEN3PAE_DOM0
--- a/sys/arch/i386/conf/XEN3PAE_DOM0   Thu Apr 09 11:10:07 2020 +0000
+++ b/sys/arch/i386/conf/XEN3PAE_DOM0   Thu Apr 09 14:39:10 2020 +0000
@@ -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)
diff -r 08b8fdc1ba57 -r cd1bc7cd60eb sys/arch/i386/conf/XEN3PAE_DOMU
--- a/sys/arch/i386/conf/XEN3PAE_DOMU   Thu Apr 09 11:10:07 2020 +0000
+++ b/sys/arch/i386/conf/XEN3PAE_DOMU   Thu Apr 09 14:39:10 2020 +0000
@@ -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
diff -r 08b8fdc1ba57 -r cd1bc7cd60eb sys/arch/i386/conf/XEN3PAE_PVHVM
--- a/sys/arch/i386/conf/XEN3PAE_PVHVM  Thu Apr 09 11:10:07 2020 +0000
+++ b/sys/arch/i386/conf/XEN3PAE_PVHVM  Thu Apr 09 14:39:10 2020 +0000
@@ -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
 
diff -r 08b8fdc1ba57 -r cd1bc7cd60eb sys/arch/i386/conf/std.xen
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/conf/std.xen        Thu Apr 09 14:39:10 2020 +0000
@@ -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"
diff -r 08b8fdc1ba57 -r cd1bc7cd60eb sys/arch/xen/conf/std.xen
--- a/sys/arch/xen/conf/std.xen Thu Apr 09 11:10:07 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# $NetBSD: std.xen,v 1.10 2019/02/04 18:14:53 cherry 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
-
-options        __XEN_INTERFACE_VERSION__=0x00030208 # Xen 3.1 interface
-
-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"
diff -r 08b8fdc1ba57 -r cd1bc7cd60eb sys/arch/xen/conf/std.xenversion
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/xen/conf/std.xenversion  Thu Apr 09 14:39:10 2020 +0000
@@ -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
+



Home | Main Index | Thread Index | Old Index