diff options
| author | gjb <gjb@FreeBSD.org> | 2013-10-11 19:40:28 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-10-11 19:40:28 +0000 |
| commit | 1189d79d8143cb7194a95c27cda104dfd9a8f3cb (patch) | |
| tree | 720e9b9d2786320035196c7acc4472736784bcea /sys/amd64/conf/GENERIC | |
| parent | 25de60c694cf4bcd99f2b6aff090be213848cde3 (diff) | |
| download | FreeBSD-src-1189d79d8143cb7194a95c27cda104dfd9a8f3cb.zip FreeBSD-src-1189d79d8143cb7194a95c27cda104dfd9a8f3cb.tar.gz | |
Document XENHVM and xenpci are mutually inclusive.
Submitted by: gibbs
Approved by: re (delphij)
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/amd64/conf/GENERIC')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index ed9958e..92b0e5a 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -72,7 +72,6 @@ options KDTRACE_FRAME # Ensure frames are compiled in 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. @@ -345,8 +344,10 @@ device virtio_balloon # VirtIO Memory Balloon device # 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 |
