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.

Requested by:	luigi
Approved by:	grehan (mentor)
MFC after:	3 days
This commit is contained in:
Bryan Venteicher 2013-03-06 07:17:53 +00:00
parent ba02487a0e
commit 0cfbcf8c7b
4 changed files with 24 additions and 10 deletions

View file

@ -442,6 +442,13 @@ options SAFE_RNDTEST # enable rndtest support
#
# 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

View file

@ -393,11 +393,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/kern_clocksource.c standard

View file

@ -374,11 +374,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/acpi_machdep.c optional acpi
acpi_wakecode.o optional acpi \
dependency "$S/i386/acpica/acpi_wakecode.S assym.s" \

View file

@ -773,6 +773,13 @@ device glxsb # AMD Geode LX Security Block
#
# 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