diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2013-10-11 19:40:28 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2013-10-11 19:40:28 +0000 |
| commit | 6b48eebec65785697c80c4ed96d6055a5b97b2ae (patch) | |
| tree | 720e9b9d2786320035196c7acc4472736784bcea /sys/i386/conf/GENERIC | |
| parent | 92aece216f22e11d295f0272f45a921ad473861f (diff) | |
| download | src-6b48eebec65785697c80c4ed96d6055a5b97b2ae.tar.gz src-6b48eebec65785697c80c4ed96d6055a5b97b2ae.zip | |
Document XENHVM and xenpci are mutually inclusive.
Submitted by: gibbs
Approved by: re (delphij)
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=256328
Diffstat (limited to 'sys/i386/conf/GENERIC')
| -rw-r--r-- | sys/i386/conf/GENERIC | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index dfaf4ab1d823..53d54d75855a 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -72,7 +72,6 @@ options MAC # TrustedBSD MAC Framework 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. @@ -356,8 +355,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 |