diff options
| author | gjb <gjb@FreeBSD.org> | 2013-10-11 19:43:37 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-10-11 19:43:37 +0000 |
| commit | 3595c37915b5d237d693934d027629266b06d30a (patch) | |
| tree | ba55cf7215b14da66c920079a128020ff158232a | |
| parent | e63a0d23bfc4424df90eeb5ea7a1b3f7672d1cb6 (diff) | |
| download | FreeBSD-src-3595c37915b5d237d693934d027629266b06d30a.zip FreeBSD-src-3595c37915b5d237d693934d027629266b06d30a.tar.gz | |
MFC r256328:
Document XENHVM and xenpci are mutually inclusive.
Approved by: re (delphij)
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | sys/amd64/conf/GENERIC | 7 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 4b59bad..3b48f0f 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. @@ -336,8 +335,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 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 88eb9c4..0af6fde 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. @@ -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 |
