Author: bryanv
Date: Tue Feb 26 05:27:02 2013
New Revision: 247306
URL: http://svnweb.freebsd.org/changeset/base/247306

Log:
  Complete MFC of r245362
  
      Add VirtIO to i386 and amd64 GENERIC
  
  This completes the MFC of r245362 not was not done
  in r246885. 9-STABLE VirtIO should now match HEAD.
  
  Approved by:  grehan

Modified:
  stable/9/sys/amd64/conf/GENERIC
  stable/9/sys/i386/conf/GENERIC
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)
  stable/9/sys/modules/   (props changed)

Modified: stable/9/sys/amd64/conf/GENERIC
==============================================================================
--- stable/9/sys/amd64/conf/GENERIC     Tue Feb 26 05:12:25 2013        
(r247305)
+++ stable/9/sys/amd64/conf/GENERIC     Tue Feb 26 05:27:02 2013        
(r247306)
@@ -341,3 +341,11 @@ device             snd_hda         # Intel High Definition
 device         snd_ich         # Intel, NVidia and other ICH AC'97 Audio
 device         snd_uaudio      # USB Audio
 device         snd_via8233     # VIA VT8233x Audio
+
+# 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

Modified: stable/9/sys/i386/conf/GENERIC
==============================================================================
--- stable/9/sys/i386/conf/GENERIC      Tue Feb 26 05:12:25 2013        
(r247305)
+++ stable/9/sys/i386/conf/GENERIC      Tue Feb 26 05:27:02 2013        
(r247306)
@@ -354,3 +354,11 @@ device             snd_hda         # Intel High Definition
 device         snd_ich         # Intel, NVidia and other ICH AC'97 Audio
 device         snd_uaudio      # USB Audio
 device         snd_via8233     # VIA VT8233x Audio
+
+# 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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to