Wed Jul 22 16:53:34 2015 UTC ()
Pull up following revision(s) (requested by bouyer in ticket #884):
	sys/arch/amd64/conf/XEN3_DOM0: revision 1.114
	sys/arch/amd64/conf/XEN3_DOMU: revision 1.62
	sys/arch/i386/conf/XEN3_DOM0: revision 1.96
	sys/arch/i386/conf/XEN3_DOMU: revision 1.68
Uncoment options IPSEC, as requested by Gary Duzan in PR port-amd64/50052


(snj)
diff -r1.103.2.3 -r1.103.2.4 src/sys/arch/amd64/conf/XEN3_DOM0
diff -r1.54.2.3 -r1.54.2.4 src/sys/arch/amd64/conf/XEN3_DOMU
diff -r1.85.2.4 -r1.85.2.5 src/sys/arch/i386/conf/XEN3_DOM0
diff -r1.59.2.4 -r1.59.2.5 src/sys/arch/i386/conf/XEN3_DOMU
cvs diff -r1.103.2.3 -r1.103.2.4 src/sys/arch/amd64/conf/XEN3_DOM0 (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/XEN3_DOM0 2014/11/18 19:05:28 1.103.2.3
+++ src/sys/arch/amd64/conf/XEN3_DOM0 2015/07/22 16:53:34 1.103.2.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: XEN3_DOM0,v 1.103.2.3 2014/11/18 19:05:28 snj Exp $ 1# $NetBSD: XEN3_DOM0,v 1.103.2.4 2015/07/22 16:53:34 snj Exp $
2 2
3include "arch/amd64/conf/std.xen" 3include "arch/amd64/conf/std.xen"
4 4
5options INCLUDE_CONFIG_FILE # embed config file in kernel binary 5options INCLUDE_CONFIG_FILE # embed config file in kernel binary
6 6
7#options UVMHIST 7#options UVMHIST
8#options UVMHIST_PRINT 8#options UVMHIST_PRINT
9#options SYSCALL_DEBUG 9#options SYSCALL_DEBUG
10 10
11maxusers 32 # estimated number of users 11maxusers 32 # estimated number of users
12 12
13# 13#
14options DOM0OPS 14options DOM0OPS
@@ -112,27 +112,27 @@ options QUOTA2 # new, in-filesystem UF @@ -112,27 +112,27 @@ options QUOTA2 # new, in-filesystem UF
112#options FFS_EI # FFS Endian Independent support 112#options FFS_EI # FFS Endian Independent support
113options WAPBL # File system journaling support 113options WAPBL # File system journaling support
114#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental 114#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
115options NFSSERVER # Network File System server 115options NFSSERVER # Network File System server
116#options FFS_NO_SNAPSHOT # No FFS snapshot support 116#options FFS_NO_SNAPSHOT # No FFS snapshot support
117options UFS_EXTATTR # Extended attribute support for UFS1 117options UFS_EXTATTR # Extended attribute support for UFS1
118#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and 118#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
119 # immutable) behave as system flags. 119 # immutable) behave as system flags.
120 120
121# Networking options 121# Networking options
122#options GATEWAY # packet forwarding 122#options GATEWAY # packet forwarding
123options INET # IP + ICMP + TCP + UDP 123options INET # IP + ICMP + TCP + UDP
124options INET6 # IPV6 124options INET6 # IPV6
125#options IPSEC # IP security 125options IPSEC # IP security
126#options IPSEC_DEBUG # debug for IP security 126#options IPSEC_DEBUG # debug for IP security
127#options MROUTING # IP multicast routing 127#options MROUTING # IP multicast routing
128#options PIM # Protocol Independent Multicast 128#options PIM # Protocol Independent Multicast
129options NETATALK # AppleTalk networking protocols 129options NETATALK # AppleTalk networking protocols
130options PPP_BSDCOMP # BSD-Compress compression support for PPP 130options PPP_BSDCOMP # BSD-Compress compression support for PPP
131options PPP_DEFLATE # Deflate compression support for PPP 131options PPP_DEFLATE # Deflate compression support for PPP
132options PPP_FILTER # Active filter support for PPP (requires bpf) 132options PPP_FILTER # Active filter support for PPP (requires bpf)
133options IPFILTER_LOG # ipmon(8) log support 133options IPFILTER_LOG # ipmon(8) log support
134options IPFILTER_LOOKUP # ippool(8) support 134options IPFILTER_LOOKUP # ippool(8) support
135#options IPFILTER_DEFAULT_BLOCK # block all packets by default 135#options IPFILTER_DEFAULT_BLOCK # block all packets by default
136#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG 136#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
137 137
138#options ALTQ # Manipulate network interfaces' output queues 138#options ALTQ # Manipulate network interfaces' output queues
cvs diff -r1.54.2.3 -r1.54.2.4 src/sys/arch/amd64/conf/XEN3_DOMU (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/XEN3_DOMU 2014/11/18 19:05:28 1.54.2.3
+++ src/sys/arch/amd64/conf/XEN3_DOMU 2015/07/22 16:53:34 1.54.2.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: XEN3_DOMU,v 1.54.2.3 2014/11/18 19:05:28 snj Exp $ 1# $NetBSD: XEN3_DOMU,v 1.54.2.4 2015/07/22 16:53:34 snj Exp $
2 2
3include "arch/amd64/conf/std.xen" 3include "arch/amd64/conf/std.xen"
4 4
5options MULTIPROCESSOR 5options MULTIPROCESSOR
6 6
7options INCLUDE_CONFIG_FILE # embed config file in kernel binary 7options INCLUDE_CONFIG_FILE # embed config file in kernel binary
8 8
9#options UVMHIST 9#options UVMHIST
10#options UVMHIST_PRINT 10#options UVMHIST_PRINT
11#options SYSCALL_DEBUG 11#options SYSCALL_DEBUG
12 12
13maxusers 32 # estimated number of users 13maxusers 32 # estimated number of users
14 14
@@ -106,27 +106,27 @@ options QUOTA2 # new, in-filesystem UF @@ -106,27 +106,27 @@ options QUOTA2 # new, in-filesystem UF
106#options FFS_EI # FFS Endian Independent support 106#options FFS_EI # FFS Endian Independent support
107options WAPBL # File system journaling support 107options WAPBL # File system journaling support
108#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental 108#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
109options NFSSERVER # Network File System server 109options NFSSERVER # Network File System server
110#options FFS_NO_SNAPSHOT # No FFS snapshot support 110#options FFS_NO_SNAPSHOT # No FFS snapshot support
111options UFS_EXTATTR # Extended attribute support for UFS1 111options UFS_EXTATTR # Extended attribute support for UFS1
112#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and 112#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
113 # immutable) behave as system flags. 113 # immutable) behave as system flags.
114 114
115# Networking options 115# Networking options
116#options GATEWAY # packet forwarding 116#options GATEWAY # packet forwarding
117options INET # IP + ICMP + TCP + UDP 117options INET # IP + ICMP + TCP + UDP
118options INET6 # IPV6 118options INET6 # IPV6
119#options IPSEC # IP security 119options IPSEC # IP security
120#options IPSEC_DEBUG # debug for IP security 120#options IPSEC_DEBUG # debug for IP security
121#options MROUTING # IP multicast routing 121#options MROUTING # IP multicast routing
122#options PIM # Protocol Independent Multicast 122#options PIM # Protocol Independent Multicast
123options NETATALK # AppleTalk networking protocols 123options NETATALK # AppleTalk networking protocols
124options PPP_BSDCOMP # BSD-Compress compression support for PPP 124options PPP_BSDCOMP # BSD-Compress compression support for PPP
125options PPP_DEFLATE # Deflate compression support for PPP 125options PPP_DEFLATE # Deflate compression support for PPP
126options PPP_FILTER # Active filter support for PPP (requires bpf) 126options PPP_FILTER # Active filter support for PPP (requires bpf)
127options IPFILTER_LOG # ipmon(8) log support 127options IPFILTER_LOG # ipmon(8) log support
128options IPFILTER_LOOKUP # ippool(8) support 128options IPFILTER_LOOKUP # ippool(8) support
129options IPFILTER_COMPAT # Compat for IP-Filter 129options IPFILTER_COMPAT # Compat for IP-Filter
130#options IPFILTER_DEFAULT_BLOCK # block all packets by default 130#options IPFILTER_DEFAULT_BLOCK # block all packets by default
131#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG 131#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
132 132
cvs diff -r1.85.2.4 -r1.85.2.5 src/sys/arch/i386/conf/Attic/XEN3_DOM0 (expand / switch to unified diff)

--- src/sys/arch/i386/conf/Attic/XEN3_DOM0 2015/06/05 16:52:39 1.85.2.4
+++ src/sys/arch/i386/conf/Attic/XEN3_DOM0 2015/07/22 16:53:34 1.85.2.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: XEN3_DOM0,v 1.85.2.4 2015/06/05 16:52:39 snj Exp $ 1# $NetBSD: XEN3_DOM0,v 1.85.2.5 2015/07/22 16:53:34 snj Exp $
2# 2#
3# XEN3_0: Xen 3.0 domain0 kernel 3# XEN3_0: Xen 3.0 domain0 kernel
4 4
5include "arch/xen/conf/std.xen" 5include "arch/xen/conf/std.xen"
6 6
7options INCLUDE_CONFIG_FILE # embed config file in kernel binary 7options INCLUDE_CONFIG_FILE # embed config file in kernel binary
8 8
9#options UVMHIST 9#options UVMHIST
10#options UVMHIST_PRINT 10#options UVMHIST_PRINT
11#options SYSCALL_DEBUG 11#options SYSCALL_DEBUG
12 12
13maxusers 32 # estimated number of users 13maxusers 32 # estimated number of users
14 14
@@ -135,27 +135,27 @@ options QUOTA2 # new, in-filesystem UF @@ -135,27 +135,27 @@ options QUOTA2 # new, in-filesystem UF
135#options FFS_EI # FFS Endian Independent support 135#options FFS_EI # FFS Endian Independent support
136options WAPBL # File system journaling support 136options WAPBL # File system journaling support
137#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental 137#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
138options NFSSERVER # Network File System server 138options NFSSERVER # Network File System server
139#options FFS_NO_SNAPSHOT # No FFS snapshot support 139#options FFS_NO_SNAPSHOT # No FFS snapshot support
140options UFS_EXTATTR # Extended attribute support for UFS1 140options UFS_EXTATTR # Extended attribute support for UFS1
141#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and 141#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
142 # immutable) behave as system flags. 142 # immutable) behave as system flags.
143 143
144# Networking options 144# Networking options
145#options GATEWAY # packet forwarding 145#options GATEWAY # packet forwarding
146options INET # IP + ICMP + TCP + UDP 146options INET # IP + ICMP + TCP + UDP
147options INET6 # IPv6 147options INET6 # IPv6
148#options IPSEC # IP security 148options IPSEC # IP security
149#options IPSEC_DEBUG # debug for IP security 149#options IPSEC_DEBUG # debug for IP security
150#options MROUTING # IP multicast routing 150#options MROUTING # IP multicast routing
151#options PIM # Protocol Independent Multicast 151#options PIM # Protocol Independent Multicast
152options NETATALK # AppleTalk networking protocols 152options NETATALK # AppleTalk networking protocols
153options PPP_BSDCOMP # BSD-Compress compression support for PPP 153options PPP_BSDCOMP # BSD-Compress compression support for PPP
154options PPP_DEFLATE # Deflate compression support for PPP 154options PPP_DEFLATE # Deflate compression support for PPP
155options PPP_FILTER # Active filter support for PPP (requires bpf) 155options PPP_FILTER # Active filter support for PPP (requires bpf)
156options IPFILTER_LOG # ipmon(8) log support 156options IPFILTER_LOG # ipmon(8) log support
157options IPFILTER_LOOKUP # ippool(8) support 157options IPFILTER_LOOKUP # ippool(8) support
158#options IPFILTER_DEFAULT_BLOCK # block all packets by default 158#options IPFILTER_DEFAULT_BLOCK # block all packets by default
159#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG 159#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
160 160
161#options ALTQ # Manipulate network interfaces' output queues 161#options ALTQ # Manipulate network interfaces' output queues
cvs diff -r1.59.2.4 -r1.59.2.5 src/sys/arch/i386/conf/Attic/XEN3_DOMU (expand / switch to unified diff)

--- src/sys/arch/i386/conf/Attic/XEN3_DOMU 2015/06/05 16:52:39 1.59.2.4
+++ src/sys/arch/i386/conf/Attic/XEN3_DOMU 2015/07/22 16:53:34 1.59.2.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: XEN3_DOMU,v 1.59.2.4 2015/06/05 16:52:39 snj Exp $ 1# $NetBSD: XEN3_DOMU,v 1.59.2.5 2015/07/22 16:53:34 snj Exp $
2 2
3include "arch/xen/conf/std.xen" 3include "arch/xen/conf/std.xen"
4 4
5options MULTIPROCESSOR 5options MULTIPROCESSOR
6 6
7options INCLUDE_CONFIG_FILE # embed config file in kernel binary 7options INCLUDE_CONFIG_FILE # embed config file in kernel binary
8 8
9#options UVMHIST 9#options UVMHIST
10#options UVMHIST_PRINT 10#options UVMHIST_PRINT
11#options SYSCALL_DEBUG 11#options SYSCALL_DEBUG
12 12
13maxusers 32 # estimated number of users 13maxusers 32 # estimated number of users
14 14
@@ -124,27 +124,27 @@ options QUOTA2 # new, in-filesystem UF @@ -124,27 +124,27 @@ options QUOTA2 # new, in-filesystem UF
124options WAPBL # File system journaling support 124options WAPBL # File system journaling support
125#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental 125#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
126options NFSSERVER # Network File System server 126options NFSSERVER # Network File System server
127#options FFS_NO_SNAPSHOT # No FFS snapshot support 127#options FFS_NO_SNAPSHOT # No FFS snapshot support
128options UFS_EXTATTR # Extended attribute support for UFS1 128options UFS_EXTATTR # Extended attribute support for UFS1
129#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and 129#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
130 # immutable) behave as system flags. 130 # immutable) behave as system flags.
131#options V7FS_EI # V7FS Endian Independent support 131#options V7FS_EI # V7FS Endian Independent support
132 132
133# Networking options 133# Networking options
134#options GATEWAY # packet forwarding 134#options GATEWAY # packet forwarding
135options INET # IP + ICMP + TCP + UDP 135options INET # IP + ICMP + TCP + UDP
136options INET6 # IPv6 136options INET6 # IPv6
137#options IPSEC # IP security 137options IPSEC # IP security
138#options IPSEC_DEBUG # debug for IP security 138#options IPSEC_DEBUG # debug for IP security
139#options MROUTING # IP multicast routing 139#options MROUTING # IP multicast routing
140#options PIM # Protocol Independent Multicast 140#options PIM # Protocol Independent Multicast
141options NETATALK # AppleTalk networking protocols 141options NETATALK # AppleTalk networking protocols
142options PPP_BSDCOMP # BSD-Compress compression support for PPP 142options PPP_BSDCOMP # BSD-Compress compression support for PPP
143options PPP_DEFLATE # Deflate compression support for PPP 143options PPP_DEFLATE # Deflate compression support for PPP
144options PPP_FILTER # Active filter support for PPP (requires bpf) 144options PPP_FILTER # Active filter support for PPP (requires bpf)
145options IPFILTER_LOG # ipmon(8) log support 145options IPFILTER_LOG # ipmon(8) log support
146options IPFILTER_LOOKUP # ippool(8) support 146options IPFILTER_LOOKUP # ippool(8) support
147options IPFILTER_COMPAT # Compat for IP-Filter 147options IPFILTER_COMPAT # Compat for IP-Filter
148#options IPFILTER_DEFAULT_BLOCK # block all packets by default 148#options IPFILTER_DEFAULT_BLOCK # block all packets by default
149#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG 149#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
150 150