--- elwix/config/Attic/ELWIX	2012/10/09 08:47:50	1.3.2.12
+++ elwix/config/Attic/ELWIX	2013/01/25 15:46:24	1.4.2.4
@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.578 2012/09/13 10:12:16 kib Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.583 2013/01/14 00:28:54 svnexp Exp $
 
 cpu		I486_CPU
 cpu		I586_CPU
@@ -39,6 +39,7 @@ options 	SOFTUPDATES		# Enable FFS soft updates suppor
 options 	UFS_ACL			# Support for access control lists
 options 	UFS_DIRHASH		# Improve performance on big directories
 options 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
+options 	QUOTA			# Enable disk quotas for UFS
 options 	MD_ROOT			# MD is a potential root device
 options 	NFSCL			# New Network Filesystem Client
 options 	NFSD			# New Network Filesystem Server
@@ -54,6 +55,7 @@ options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_RAID		# Soft RAID functionality.
 options 	GEOM_LABEL		# Provides labelization
+options 	GEOM_GATE
 options 	GEOM_UZIP
 options         GEOM_ELI
 options         GEOM_MIRROR
@@ -139,6 +141,7 @@ device		hptiop		# Highpoint RocketRaid 3xxx series
 device		isp		# Qlogic family
 #device		ispfw		# Firmware for QLogic HBAs- normally a module
 device		mpt		# LSI-Logic MPT-Fusion
+device		mps		# LSI-Logic MPT-Fusion 2
 #device		ncr		# NCR/Symbios Logic
 device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 device		trm		# Tekram DC395U/UW/F DC315U adapters
@@ -421,6 +424,14 @@ device		mmc		# MMC/SD bus
 device		mmcsd		# MMC/SD memory card
 device		sdhci		# Generic PCI SD Host Controller
 
+# VirtIO support
+device		virtio		# Generic VirtIO bus (required)
+device		virtio_pci	# VirtIO PCI device
+device		vtnet		# VirtIO Ethernet device
+device		virtio_blk	# VirtIO Block device
+device		virtio_scsi	# VirtIO SCSI device
+device		virtio_balloon	# VirtIO Memory Balloon device
+
 ### ELWIX Additional custom settings ...
 
 device		if_bridge
@@ -464,7 +475,6 @@ options 	IPFIREWALL
 options 	IPFIREWALL_VERBOSE
 options 	IPFIREWALL_VERBOSE_LIMIT=100
 options 	IPFIREWALL_DEFAULT_TO_ACCEPT
-options 	IPFIREWALL_FORWARD
 options 	IPFIREWALL_NAT
 options 	LIBALIAS
 options 	IPDIVERT
@@ -569,7 +579,7 @@ device		epair
 device		stf
 
 # NETMAP subsystem
-device		netmap
+#device		netmap
 
 device		rlswitch
 
@@ -577,5 +587,4 @@ options 	ACCEPT_FILTER_DATA
 options 	ACCEPT_FILTER_DNS
 options 	ACCEPT_FILTER_HTTP
 
-options 	ZERO_COPY_SOCKETS
 options 	SW_WATCHDOG