svn commit: r256329 - in stable/10/sys: amd64/conf i386/conf

[Glen Barber]

Author: gjb
Date: Fri Oct 11 19:43:37 2013
New Revision: 256329
URL: http://svnweb.freebsd.org/changeset/base/256329

Log:
  MFC r256328:
   Document XENHVM and xenpci are mutually inclusive.
  
  Approved by:    re (delphij)
  Sponsored by:   The FreeBSD Foundation

Modified:
  stable/10/sys/amd64/conf/GENERIC
  stable/10/sys/i386/conf/GENERIC
Directory Properties:
  stable/10/sys/   (props changed)

Modified: stable/10/sys/amd64/conf/GENERIC
==============================================================================
--- stable/10/sys/amd64/conf/GENERIC	Fri Oct 11 19:40:28 2013	(r256328)
+++ stable/10/sys/amd64/conf/GENERIC	Fri Oct 11 19:43:37 2013	(r256329)
@@ -72,7 +72,6 @@ options 	KDTRACE_FRAME		# Ensure frames 
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# Kernel ELF linker loads CTF data
 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.
@@ -336,8 +335,10 @@ device		virtio_balloon	# VirtIO Memory B
 # HyperV drivers
 device		hyperv		# HyperV drivers 
 
-# Xen support
-device		xenpci		# Generic Xen bus
+# 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

Modified: stable/10/sys/i386/conf/GENERIC
==============================================================================
--- stable/10/sys/i386/conf/GENERIC	Fri Oct 11 19:40:28 2013	(r256328)
+++ stable/10/sys/i386/conf/GENERIC	Fri Oct 11 19:43:37 2013	(r256329)
@@ -72,7 +72,6 @@ options 	MAC			# TrustedBSD MAC Framewor
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# Kernel ELF linker loads CTF data
 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.
@@ -347,8 +346,10 @@ 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
+# 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