--- elwix/config/ELWIX_i386	2014/01/05 23:14:23	1.4
+++ elwix/config/ELWIX_i386	2014/01/05 23:16:08	1.4.2.1
@@ -1,4 +1,4 @@
-# $Id: ELWIX_i386,v 1.4 2014/01/05 23:14:23 misho Exp $
+# $Id: ELWIX_i386,v 1.4.2.1 2014/01/05 23:16:08 misho Exp $
 # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.590 2013/07/07 00:29:29 svnexp Exp $
 
 cpu		I486_CPU
@@ -82,7 +82,6 @@ options 	MAC			# TrustedBSD MAC Framework
 #options 	DDB_CTF			# Kernel ELF linker loads CTF data
 options 	FLOWTABLE		# per-cpu routing cache
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
-options 	XENHVM			# Include Xen support
 
 # Debugging support.  Always need this:
 #options 	KDB			# Enable kernel debugger support.
@@ -429,8 +428,16 @@ device		virtio_blk	# VirtIO Block device
 device		virtio_scsi	# VirtIO SCSI device
 device		virtio_balloon	# VirtIO Memory Balloon device
 
-# Xen support
-device		xenpci		# Generic Xen bus
+# HyperV drivers
+device		hyperv		# HyperV drivers 
+
+# Xen HVM Guest Optimizations
+# NOTE: XENHVM depends on xenpci.  They must be added or removed together.
+options 	XENHVM		# Xen HVM kernel infrastructure
+device		xenpci		# Xen HVM Hypervisor services driver
+
+# VMware support
+device		vmx		# VMware VMXNET3 Ethernet
 
 ### ELWIX Additional custom settings ...