diff options
| author | attilio <attilio@FreeBSD.org> | 2013-03-07 23:52:15 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2013-03-07 23:52:15 +0000 |
| commit | 993799493c64eb0b9faeab971fbe4ecfe0214278 (patch) | |
| tree | 682d8b7873b11a4587bc83365e5517e0bf3b1d56 /sys/i386 | |
| parent | 82aa86d64f200298024bc532c74e5e24a0710487 (diff) | |
| parent | 640e058da3cee2710fd66a67abbb548aad74104e (diff) | |
| download | FreeBSD-src-993799493c64eb0b9faeab971fbe4ecfe0214278.zip FreeBSD-src-993799493c64eb0b9faeab971fbe4ecfe0214278.tar.gz | |
Merge from vmcontention
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 3a98ded..d35a780 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -146,7 +146,10 @@ device sa # Sequential Access (tape etc) device cd # CD device pass # Passthrough device (direct ATA/SCSI access) device ses # Enclosure Services (SES and SAF-TE) -#device ctl # CAM Target Layer +device ctl # CAM Target Layer +options CTL_DISABLE # Disable CTL by default to save memory. + # Re-enable with kern.cam.ctl.disable=0 in + # /boot/loader.conf # RAID controllers interfaced to the SCSI subsystem device amr # AMI MegaRAID diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 95ccd4e..f8f78cc 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -773,6 +773,13 @@ device glxsb # AMD Geode LX Security Block # # VirtIO support +# +# The virtio entry provides a generic bus for use by the device drivers. +# It must be combined with an interface that communicates with the host. +# Multiple such interfaces defined by the VirtIO specification. FreeBSD +# only has support for PCI. Therefore, virtio_pci must be statically +# compiled in or loaded as a module for the device drivers to function. +# device virtio # Generic VirtIO bus (required) device virtio_pci # VirtIO PCI Interface device vtnet # VirtIO Ethernet device |
