summaryrefslogtreecommitdiffstats
path: root/sys/amd64/conf
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2013-12-18 05:20:53 +0000
committerglebius <glebius@FreeBSD.org>2013-12-18 05:20:53 +0000
commita70f2adf579c967cdf8017632ea2266fe2e9eb4a (patch)
tree4d4747b43b02d855783b9aab398fb38f936a465a /sys/amd64/conf
parente704ad0c2f66c3585c48a8495a17c4acc355772b (diff)
downloadFreeBSD-src-a70f2adf579c967cdf8017632ea2266fe2e9eb4a.zip
FreeBSD-src-a70f2adf579c967cdf8017632ea2266fe2e9eb4a.tar.gz
Merge r256868,257276-257277,257515,257913 from head. These are fixes
required to make Xen buтldable w/o INET. Sponsored by: Nginx, Inc.
Diffstat (limited to 'sys/amd64/conf')
-rw-r--r--sys/amd64/conf/NOTES6
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index ad01088..f774d26 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -473,6 +473,12 @@ device virtio_blk # VirtIO Block device
device virtio_scsi # VirtIO SCSI device
device virtio_balloon # VirtIO Memory Balloon device
+device hyperv # HyperV drivers
+
+# Xen HVM Guest Optimizations
+options XENHVM # Xen HVM kernel infrastructure
+device xenpci # Xen HVM Hypervisor services driver
+
#####################################################################
#
OpenPOWER on IntegriCloud