svn commit: r248862 - in releng/8.4/sys: amd64/conf conf i386/conf

[Bryan Venteicher]

Author: bryanv
Date: Fri Mar 29 02:14:57 2013
New Revision: 248862
URL: http://svnweb.freebsd.org/changeset/base/248862

Log:
  MFC 247870:
  
      Remove the virtio dependency entry for the VirtIO device drivers. This
      will prevent the kernel from linking if the device driver are included
      without the virtio module. Remove pci and scbus for the same reason.
  
      Also explain the relationship and necessity of the virtio and virtio_pci
      modules. Currently in FreeBSD, we only support VirtIO PCI, but it could
      be replaced with a different interface (like MMIO) and the device
      (network, block, etc) will still function.
  
  Approved by:	re (marius@)

Modified:
  releng/8.4/sys/amd64/conf/NOTES
  releng/8.4/sys/conf/files.amd64
  releng/8.4/sys/conf/files.i386
  releng/8.4/sys/i386/conf/NOTES
Directory Properties:
  releng/8.4/sys/   (props changed)
  releng/8.4/sys/amd64/   (props changed)
  releng/8.4/sys/conf/   (props changed)
  releng/8.4/sys/i386/   (props changed)

Modified: releng/8.4/sys/amd64/conf/NOTES
==============================================================================
--- releng/8.4/sys/amd64/conf/NOTES	Fri Mar 29 02:09:46 2013	(r248861)
+++ releng/8.4/sys/amd64/conf/NOTES	Fri Mar 29 02:14:57 2013	(r248862)
@@ -424,6 +424,13 @@ options 	SAFE_RNDTEST	# enable rndtest s
 
 #
 # 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

Modified: releng/8.4/sys/conf/files.amd64
==============================================================================
--- releng/8.4/sys/conf/files.amd64	Fri Mar 29 02:09:46 2013	(r248861)
+++ releng/8.4/sys/conf/files.amd64	Fri Mar 29 02:14:57 2013	(r248862)
@@ -357,11 +357,11 @@ dev/virtio/virtio.c			optional	virtio
 dev/virtio/virtqueue.c			optional	virtio
 dev/virtio/virtio_bus_if.m		optional	virtio
 dev/virtio/virtio_if.m			optional	virtio
-dev/virtio/pci/virtio_pci.c		optional	virtio_pci virtio pci
-dev/virtio/network/if_vtnet.c		optional	vtnet virtio
-dev/virtio/block/virtio_blk.c		optional	virtio_blk virtio
-dev/virtio/balloon/virtio_balloon.c	optional	virtio_balloon virtio
-dev/virtio/scsi/virtio_scsi.c		optional	virtio_scsi virtio scbus
+dev/virtio/pci/virtio_pci.c		optional	virtio_pci
+dev/virtio/network/if_vtnet.c		optional	vtnet
+dev/virtio/block/virtio_blk.c		optional	virtio_blk
+dev/virtio/balloon/virtio_balloon.c	optional	virtio_balloon
+dev/virtio/scsi/virtio_scsi.c		optional	virtio_scsi
 isa/syscons_isa.c		optional	sc
 isa/vga_isa.c			optional	vga
 kern/link_elf_obj.c		standard

Modified: releng/8.4/sys/conf/files.i386
==============================================================================
--- releng/8.4/sys/conf/files.i386	Fri Mar 29 02:09:46 2013	(r248861)
+++ releng/8.4/sys/conf/files.i386	Fri Mar 29 02:14:57 2013	(r248862)
@@ -362,11 +362,11 @@ dev/virtio/virtio.c			optional	virtio
 dev/virtio/virtqueue.c			optional	virtio
 dev/virtio/virtio_bus_if.m		optional	virtio
 dev/virtio/virtio_if.m			optional	virtio
-dev/virtio/pci/virtio_pci.c		optional	virtio_pci virtio pci
-dev/virtio/network/if_vtnet.c		optional	vtnet virtio
-dev/virtio/block/virtio_blk.c		optional	virtio_blk virtio
-dev/virtio/balloon/virtio_balloon.c	optional	virtio_balloon virtio
-dev/virtio/scsi/virtio_scsi.c		optional	virtio_scsi virtio scbus
+dev/virtio/pci/virtio_pci.c		optional	virtio_pci
+dev/virtio/network/if_vtnet.c		optional	vtnet
+dev/virtio/block/virtio_blk.c		optional	virtio_blk
+dev/virtio/balloon/virtio_balloon.c	optional	virtio_balloon
+dev/virtio/scsi/virtio_scsi.c		optional	virtio_scsi
 i386/acpica/OsdEnvironment.c	optional acpi
 i386/acpica/acpi_machdep.c	optional acpi
 i386/acpica/acpi_wakeup.c	optional acpi

Modified: releng/8.4/sys/i386/conf/NOTES
==============================================================================
--- releng/8.4/sys/i386/conf/NOTES	Fri Mar 29 02:09:46 2013	(r248861)
+++ releng/8.4/sys/i386/conf/NOTES	Fri Mar 29 02:14:57 2013	(r248862)
@@ -766,6 +766,13 @@ device		glxsb		# AMD Geode LX Security B
 
 #
 # 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