diff options
| author | Bryan Venteicher <bryanv@FreeBSD.org> | 2013-01-13 07:14:16 +0000 |
|---|---|---|
| committer | Bryan Venteicher <bryanv@FreeBSD.org> | 2013-01-13 07:14:16 +0000 |
| commit | ae366ffcbde52cc7d70417a7eb337e703f8f905e (patch) | |
| tree | ae488939270bf735bd50183525c19339d687ccac /sys/i386/conf/GENERIC | |
| parent | 6f36135181a8e98e468a61adf2ef169a2bd5ce86 (diff) | |
| download | src-ae366ffcbde52cc7d70417a7eb337e703f8f905e.tar.gz src-ae366ffcbde52cc7d70417a7eb337e703f8f905e.zip | |
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
Notes
Notes:
svn path=/head/; revision=245362
Diffstat (limited to 'sys/i386/conf/GENERIC')
| -rw-r--r-- | sys/i386/conf/GENERIC | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 3a808ba0e0c1..819379ee5567 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 |