d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add VirtIO to the i386 and amd64 GENERIC kernels

Browse Source 
This also removes the kludge from r239009 that covered only
the network driver.

Reviewed by:	grehan
Approved by:	grehan (mentor)
MFC after:	1 week
This commit is contained in:
Bryan Venteicher 2013-01-13 07:14:16 +00:00
parent 6f36135181
commit ae366ffcbd
7 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/amd64/conf/GENERIC
View File

@ -332,3 +332,11 @@ device snd_via8233 # VIA VT8233x Audio
device mmc # MMC/SD bus
device mmcsd # MMC/SD memory card
device sdhci # Generic PCI SD Host Controller
# VirtIO support
device virtio # Generic VirtIO bus (required)
device virtio_pci # VirtIO PCI device
device vtnet # VirtIO Ethernet device
device virtio_blk # VirtIO Block device
device virtio_scsi # VirtIO SCSI device
device virtio_balloon # VirtIO Memory Balloon device

9
sys/amd64/conf/NOTES
View File

@ -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
#####################################################################
#

9
sys/conf/files
View File

@ -2276,15 +2276,6 @@ dev/utopia/idtphy.c optional utopia
dev/utopia/suni.c optional utopia
dev/utopia/utopia.c optional utopia
dev/vge/if_vge.c optional vge
#
# virtio support
#
dev/virtio/pci/virtio_pci.c optional vtnet
dev/virtio/virtio.c optional vtnet
dev/virtio/virtqueue.c optional vtnet
dev/virtio/network/if_vtnet.c optional vtnet
dev/virtio/virtio_bus_if.m optional vtnet
dev/virtio/virtio_if.m optional vtnet
dev/vkbd/vkbd.c optional vkbd
dev/vr/if_vr.c optional vr pci

9
sys/conf/files.amd64
View File

@ -390,6 +390,15 @@ dev/isci/scil/scif_sas_task_request.c optional isci
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

9
sys/conf/files.i386
View File

@ -371,6 +371,15 @@ dev/isci/scil/scif_sas_task_request.c optional isci
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" \

8
sys/i386/conf/GENERIC
View File

@ -346,3 +346,11 @@ device snd_via8233 # VIA VT8233x Audio
device mmc # MMC/SD bus
device mmcsd # MMC/SD memory card
device sdhci # Generic PCI SD Host Controller
# VirtIO support
device virtio # Generic VirtIO bus (required)
device virtio_pci # VirtIO PCI device
device vtnet # VirtIO Ethernet device
device virtio_blk # VirtIO Block device
device virtio_scsi # VirtIO SCSI device
device virtio_balloon # VirtIO Memory Balloon device

9
sys/i386/conf/NOTES
View File

@ -771,6 +771,15 @@ device glxiic # AMD Geode LX CS5536 System Management Bus
#
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
#####################################################################
#