summaryrefslogtreecommitdiffstats
path: root/sys/i386/conf/GENERIC
diff options
context:
space:
mode:
authorbryanv <bryanv@FreeBSD.org>2013-01-13 07:14:16 +0000
committerbryanv <bryanv@FreeBSD.org>2013-01-13 07:14:16 +0000
commitdf2fc90f0e744447190cbd4a0d67474ddadfa96c (patch)
treeae488939270bf735bd50183525c19339d687ccac /sys/i386/conf/GENERIC
parentcacaa2c24012e9867f40bd03e6d1065cce1a07b0 (diff)
downloadFreeBSD-src-df2fc90f0e744447190cbd4a0d67474ddadfa96c.zip
FreeBSD-src-df2fc90f0e744447190cbd4a0d67474ddadfa96c.tar.gz
Add VirtIO to the i386 and amd64 GENERIC kernels
This also removes the kludge from r239009 that covered only the network driver. Reviewed by: grehan Approved by: grehan (mentor) MFC after: 1 week
Diffstat (limited to 'sys/i386/conf/GENERIC')
-rw-r--r--sys/i386/conf/GENERIC8
1 files changed, 8 insertions, 0 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 3a808ba..819379e 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -346,3 +346,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
OpenPOWER on IntegriCloud