Module Name: src
Committed By: chs
Date: Sun Sep 23 01:05:22 UTC 2012
Modified Files:
src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/i386/conf: GENERIC XEN3_DOM0 XEN3_DOMU
Log Message:
add vmt entry to GENERIC.
standardize commented pfsync and npf entries.
To generate a diff of this commit:
cvs rdiff -u -r1.363 -r1.364 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.1079 -r1.1080 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/i386/conf/XEN3_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/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.363 src/sys/arch/amd64/conf/GENERIC:1.364
--- src/sys/arch/amd64/conf/GENERIC:1.363 Sat Sep 1 18:17:49 2012
+++ src/sys/arch/amd64/conf/GENERIC Sun Sep 23 01:05:21 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.363 2012/09/01 18:17:49 jakllsch Exp $
+# $NetBSD: GENERIC,v 1.364 2012/09/23 01:05:21 chs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.363 $"
+#ident "GENERIC-$Revision: 1.364 $"
maxusers 64 # estimated number of users
@@ -78,6 +78,7 @@ coretemp* at cpu? # Intel on-die therma
est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI)
#odcm0 at cpu0 # On-demand clock modulation
powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI)
+vmt0 at cpu0 # VMware Tools
# Alternate buffer queue strategies for better responsiveness under high
# disk I/O load.
@@ -1150,9 +1151,11 @@ viomb* at virtio? # Virtio memory ball
ld* at virtio? # Virtio disk device
vioif* at virtio? # Virtio network device
+
# Pull in optional local configuration
cinclude "arch/amd64/conf/GENERIC.local"
+
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
@@ -1182,8 +1185,6 @@ options MEMORY_DISK_DYNAMIC # loaded vi
pseudo-device vnd # disk-like interface to files
#options VND_COMPRESSION # compressed vnd(4)
-# NPF
-#pseudo-device npf
# network pseudo-devices
pseudo-device bpfilter # Berkeley packet filter
@@ -1206,6 +1207,10 @@ pseudo-device vlan # IEEE 802.1q encap
pseudo-device bridge # simple inter-network bridging
#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
+#pseudo-device pf # PF packet filter
+#pseudo-device pflog # PF log if
+#pseudo-device pfsync # PF sync if
+#pseudo-device npf # NPF packet filter
#
# accept filters
@@ -1219,8 +1224,6 @@ pseudo-device sequencer 1 # MIDI sequenc
#options RND_COM # use "com" randomness as well (BROKEN)
pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
-#pseudo-device pf # PF packet filter
-#pseudo-device pflog # PF log if
pseudo-device lockstat # lock profiling
pseudo-device bcsp # BlueCore Serial Protocol
pseudo-device btuart # Bluetooth HCI UART (H4)
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.86 src/sys/arch/amd64/conf/XEN3_DOM0:1.87
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.86 Sat Sep 1 18:17:49 2012
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sun Sep 23 01:05:21 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.86 2012/09/01 18:17:49 jakllsch Exp $
+# $NetBSD: XEN3_DOM0,v 1.87 2012/09/23 01:05:21 chs Exp $
include "arch/amd64/conf/std.xen"
@@ -815,6 +815,8 @@ pseudo-device bridge # simple inter-ne
#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device pf # PF packet filter
#pseudo-device pflog # PF log if
+#pseudo-device pfsync # PF sync if
+#pseudo-device npf # NPF packet filter
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.38 src/sys/arch/amd64/conf/XEN3_DOMU:1.39
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.38 Sat Mar 10 21:51:48 2012
+++ src/sys/arch/amd64/conf/XEN3_DOMU Sun Sep 23 01:05:21 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.38 2012/03/10 21:51:48 joerg Exp $
+# $NetBSD: XEN3_DOMU,v 1.39 2012/09/23 01:05:21 chs Exp $
include "arch/amd64/conf/std.xen"
@@ -219,6 +219,8 @@ pseudo-device bridge # simple inter-ne
#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device pf # PF packet filter
#pseudo-device pflog # PF log if
+#pseudo-device pfsync # PF sync if
+#pseudo-device npf # NPF packet filter
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1079 src/sys/arch/i386/conf/GENERIC:1.1080
--- src/sys/arch/i386/conf/GENERIC:1.1079 Sat Sep 1 18:17:50 2012
+++ src/sys/arch/i386/conf/GENERIC Sun Sep 23 01:05:21 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1079 2012/09/01 18:17:50 jakllsch Exp $
+# $NetBSD: GENERIC,v 1.1080 2012/09/23 01:05:21 chs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1079 $"
+#ident "GENERIC-$Revision: 1.1080 $"
maxusers 64 # estimated number of users
@@ -39,6 +39,7 @@ est0 at cpu0 # Intel Enhanced SpeedSte
#padlock0 at cpu0 # VIA PadLock
powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI)
viac7temp* at cpu? # VIA C7 temperature sensor
+vmt0 at cpu0 # VMware Tools
options MTRR # memory-type range register syscall support
# doesn't work with MP just yet..
@@ -1561,6 +1562,7 @@ viomb* at virtio? # Virtio memory ball
ld* at virtio? # Virtio disk device
vioif* at virtio? # Virtio network device
+
# Pull in optional local configuration
cinclude "arch/i386/conf/GENERIC.local"
@@ -1594,9 +1596,6 @@ options MEMORY_DISK_DYNAMIC # loaded vi
pseudo-device vnd # disk-like interface to files
options VND_COMPRESSION # compressed vnd(4)
-# NPF
-#pseudo-device npf
-
# network pseudo-devices
pseudo-device bpfilter # Berkeley packet filter
#pseudo-device carp # Common Address Redundancy Protocol
@@ -1621,6 +1620,8 @@ pseudo-device bridge # simple inter-ne
pseudo-device agr # IEEE 802.3ad link aggregation
#pseudo-device pf # PF packet filter
#pseudo-device pflog # PF log if
+#pseudo-device pfsync # PF sync if
+#pseudo-device npf # NPF packet filter
#pseudo-device etherip # Tunnel Ethernet over IP
# srt is EXPERIMENTAL
#pseudo-device srt # source-address-based routing
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.68 src/sys/arch/i386/conf/XEN3_DOM0:1.69
--- src/sys/arch/i386/conf/XEN3_DOM0:1.68 Sat Sep 1 18:17:50 2012
+++ src/sys/arch/i386/conf/XEN3_DOM0 Sun Sep 23 01:05:21 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.68 2012/09/01 18:17:50 jakllsch Exp $
+# $NetBSD: XEN3_DOM0,v 1.69 2012/09/23 01:05:21 chs Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -788,6 +788,8 @@ pseudo-device bridge # simple inter-ne
#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device pf # PF packet filter
#pseudo-device pflog # PF log if
+#pseudo-device pfsync # PF sync if
+#pseudo-device npf # NPF packet filter
# accept filters
pseudo-device accf_data # "dataready" accept filter
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.44 src/sys/arch/i386/conf/XEN3_DOMU:1.45
--- src/sys/arch/i386/conf/XEN3_DOMU:1.44 Wed Jun 27 00:37:08 2012
+++ src/sys/arch/i386/conf/XEN3_DOMU Sun Sep 23 01:05:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.44 2012/06/27 00:37:08 jym Exp $
+# $NetBSD: XEN3_DOMU,v 1.45 2012/09/23 01:05:22 chs Exp $
include "arch/xen/conf/std.xen"
@@ -231,6 +231,8 @@ pseudo-device bridge # simple inter-ne
#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device pf # PF packet filter
#pseudo-device pflog # PF log if
+#pseudo-device pfsync # PF sync if
+#pseudo-device npf # NPF packet filter
# accept filters
pseudo-device accf_data # "dataready" accept filter
