summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authorneel <neel@FreeBSD.org>2013-01-17 07:04:37 +0000
committerneel <neel@FreeBSD.org>2013-01-17 07:04:37 +0000
commitd20dd131b5d2bbd1178a4ea9124b83aa7f9576df (patch)
tree3c8bad9569de99664550198eec8885bbdf6edf93 /sys/amd64
parentdee2455ab597b46c857f50c31c4ae88b56c694d4 (diff)
parentecb4042c11ebefee647476c31655e844f5e32bfe (diff)
downloadFreeBSD-src-d20dd131b5d2bbd1178a4ea9124b83aa7f9576df.zip
FreeBSD-src-d20dd131b5d2bbd1178a4ea9124b83aa7f9576df.tar.gz
IFC @ r245509
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/conf/GENERIC8
-rw-r--r--sys/amd64/conf/NOTES9
2 files changed, 17 insertions, 0 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 48f41b3..e53f692 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -332,3 +332,11 @@ device snd_via8233 # VIA VT8233x Audio
device mmc # MMC/SD bus
device mmcsd # MMC/SD memory card
device sdhci # Generic PCI SD Host Controller
+
+# VirtIO support
+device virtio # Generic VirtIO bus (required)
+device virtio_pci # VirtIO PCI device
+device vtnet # VirtIO Ethernet device
+device virtio_blk # VirtIO Block device
+device virtio_scsi # VirtIO SCSI device
+device virtio_balloon # VirtIO Memory Balloon device
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 6562981..a4371f7 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -440,6 +440,15 @@ device safe # SafeNet 1141
options SAFE_DEBUG # enable debugging support: hw.safe.debug
options SAFE_RNDTEST # enable rndtest support
+#
+# VirtIO support
+device virtio # Generic VirtIO bus (required)
+device virtio_pci # VirtIO PCI Interface
+device vtnet # VirtIO Ethernet device
+device virtio_blk # VirtIO Block device
+device virtio_scsi # VirtIO SCSI device
+device virtio_balloon # VirtIO Memory Balloon device
+
#####################################################################
#
OpenPOWER on IntegriCloud