summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/amd64/conf/NOTES7
-rw-r--r--sys/conf/files.amd6410
-rw-r--r--sys/conf/files.i38610
-rw-r--r--sys/i386/conf/NOTES7
4 files changed, 24 insertions, 10 deletions
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index a4371f7..7a41464 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -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
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 131a1e7..5e659b9 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -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
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index fd536af..f4c595a 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -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" \
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 95ccd4e..f8f78cc 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -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
OpenPOWER on IntegriCloud