Author: luigi
Date: Sat Feb 16 22:44:02 2013
New Revision: 246885
URL: http://svnweb.freebsd.org/changeset/base/246885
Log:
partial MFC of rev=245362:
enable building virtio devices into static kernels.
I think the 'files.*' entries should be improved (also in HEAD) because
bringing up a vtnet device now requires 3 entries in your kernel config:
"device virtio, device virtio_pci, device vtnet"
but i'll leave the fix to a future commit.
This is also the reason not to enable the device in GENERIC kernels now.
Modified:
stable/9/sys/amd64/conf/NOTES
stable/9/sys/conf/files.amd64
stable/9/sys/conf/files.i386
stable/9/sys/i386/conf/NOTES
Modified: stable/9/sys/amd64/conf/NOTES
==============================================================================
--- stable/9/sys/amd64/conf/NOTES Sat Feb 16 22:21:46 2013
(r246884)
+++ stable/9/sys/amd64/conf/NOTES Sat Feb 16 22:44:02 2013
(r246885)
@@ -440,6 +440,15 @@ device safe # SafeNet 1141
options SAFE_DEBUG # enable debugging support: hw.safe.debug
options SAFE_RNDTEST # enable rndtest support
+#
+# 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/conf/files.amd64
==============================================================================
--- stable/9/sys/conf/files.amd64 Sat Feb 16 22:21:46 2013
(r246884)
+++ stable/9/sys/conf/files.amd64 Sat Feb 16 22:44:02 2013
(r246885)
@@ -381,6 +381,15 @@ dev/isci/scil/scif_sas_task_request.c
dev/isci/scil/scif_sas_task_request_state_handlers.c optional isci
dev/isci/scil/scif_sas_task_request_states.c optional isci
dev/isci/scil/scif_sas_timer.c optional isci
+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
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
kern/kern_clocksource.c standard
Modified: stable/9/sys/conf/files.i386
==============================================================================
--- stable/9/sys/conf/files.i386 Sat Feb 16 22:21:46 2013
(r246884)
+++ stable/9/sys/conf/files.i386 Sat Feb 16 22:44:02 2013
(r246885)
@@ -359,6 +359,15 @@ dev/isci/scil/scif_sas_task_request.c
dev/isci/scil/scif_sas_task_request_state_handlers.c optional isci
dev/isci/scil/scif_sas_task_request_states.c optional isci
dev/isci/scil/scif_sas_timer.c optional isci
+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
i386/acpica/acpi_machdep.c optional acpi
acpi_wakecode.o optional acpi
\
dependency "$S/i386/acpica/acpi_wakecode.S assym.s" \
Modified: stable/9/sys/i386/conf/NOTES
==============================================================================
--- stable/9/sys/i386/conf/NOTES Sat Feb 16 22:21:46 2013
(r246884)
+++ stable/9/sys/i386/conf/NOTES Sat Feb 16 22:44:02 2013
(r246885)
@@ -771,6 +771,15 @@ device glxiic # AMD Geode LX CS5536 Sy
#
device glxsb # AMD Geode LX Security Block
+#
+# 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-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
