i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio: integrate into the build and image

Browse Source 
* device_manager: scans busses/virtio for network device types
  and scsi controllers.
This commit is contained in:
Jérôme Duval
2013-05-26 16:05:53 +02:00
parent a8e846d0f4
commit 3aae21ab63
5 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+5
View File
@@ -188,6 +188,7 @@ SYSTEM_ADD_ONS_DRIVERS_POWER = [ FFilterByBuildFeatures acpi_button@x86 ] ;
SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
ata@ata pci ps2@x86,x86_64 isa@x86,x86_64 ata@ata pci ps2@x86,x86_64 isa@x86,x86_64
ide@ide scsi config_manager agp_gart@x86 usb firewire@x86 acpi@x86 ide@ide scsi config_manager agp_gart@x86 usb firewire@x86 acpi@x86
virtio
] ; ] ;
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs btrfs cdda exfat ext2 fat iso9660 nfs nfs4 SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs btrfs cdda exfat ext2 fat iso9660 nfs nfs4
attribute_overlay write_overlay ntfs reiserfs@x86 udf googlefs ; attribute_overlay write_overlay ntfs reiserfs@x86 udf googlefs ;
@@ -229,6 +230,8 @@ AddFilesToHaikuImage system add-ons kernel busses scsi
: ahci ; : ahci ;
AddFilesToHaikuImage system add-ons kernel busses usb AddFilesToHaikuImage system add-ons kernel busses usb
: <usb>uhci <usb>ohci <usb>ehci ; : <usb>uhci <usb>ohci <usb>ehci ;
AddFilesToHaikuImage system add-ons kernel busses virtio
: virtio_pci@x86 ;
AddFilesToHaikuImage system add-ons kernel console : vga_text ; AddFilesToHaikuImage system add-ons kernel console : vga_text ;
AddFilesToHaikuImage system add-ons kernel debugger AddFilesToHaikuImage system add-ons kernel debugger
: <kdebug>demangle <kdebug>disasm@x86 <kdebug>hangman : <kdebug>demangle <kdebug>disasm@x86 <kdebug>hangman
@@ -250,6 +253,7 @@ if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
# drivers # drivers
AddNewDriversToHaikuImage disk scsi : scsi_cd scsi_disk ; AddNewDriversToHaikuImage disk scsi : scsi_cd scsi_disk ;
AddNewDriversToHaikuImage disk virtual : virtio_block ;
AddNewDriversToHaikuImage power : enhanced_speedstep@x86 ; AddNewDriversToHaikuImage power : enhanced_speedstep@x86 ;
AddNewDriversToHaikuImage power : acpi_battery@x86 ; AddNewDriversToHaikuImage power : acpi_battery@x86 ;
#AddNewDriversToHaikuImage display : display_controls@x86 ; #AddNewDriversToHaikuImage display : display_controls@x86 ;
@@ -607,6 +611,7 @@ AddBootModuleSymlinksToHaikuImage
ide_isa@x86 ide_isa@x86
<usb>uhci <usb>ohci <usb>ehci <usb>uhci <usb>ohci <usb>ehci
scsi_cd scsi_disk usb_disk scsi_cd scsi_disk usb_disk
virtio virtio_pci virtio_block
efi_gpt efi_gpt
intel intel
bfs bfs
src/add-ons/kernel/bus_managers/Jamfile
+1
View File
@@ -12,3 +12,4 @@ SubInclude HAIKU_TOP src add-ons kernel bus_managers ps2 ;
SubInclude HAIKU_TOP src add-ons kernel bus_managers scsi ; SubInclude HAIKU_TOP src add-ons kernel bus_managers scsi ;
SubInclude HAIKU_TOP src add-ons kernel bus_managers tty ; SubInclude HAIKU_TOP src add-ons kernel bus_managers tty ;
SubInclude HAIKU_TOP src add-ons kernel bus_managers usb ; SubInclude HAIKU_TOP src add-ons kernel bus_managers usb ;
SubInclude HAIKU_TOP src add-ons kernel bus_managers virtio ;
src/add-ons/kernel/busses/Jamfile
+1
View File
@@ -10,3 +10,4 @@ if $(HAIKU_ATA_STACK) = 1 {
SubInclude HAIKU_TOP src add-ons kernel busses agp_gart ; SubInclude HAIKU_TOP src add-ons kernel busses agp_gart ;
SubInclude HAIKU_TOP src add-ons kernel busses scsi ; SubInclude HAIKU_TOP src add-ons kernel busses scsi ;
SubInclude HAIKU_TOP src add-ons kernel busses usb ; SubInclude HAIKU_TOP src add-ons kernel busses usb ;
SubInclude HAIKU_TOP src add-ons kernel busses virtio ;
src/add-ons/kernel/drivers/disk/virtual/Jamfile
+1
View File
@@ -3,3 +3,4 @@ SubDir HAIKU_TOP src add-ons kernel drivers disk virtual ;
#SubInclude HAIKU_TOP src add-ons kernel drivers disk virtual fmap ; #SubInclude HAIKU_TOP src add-ons kernel drivers disk virtual fmap ;
SubInclude HAIKU_TOP src add-ons kernel drivers disk virtual nbd ; SubInclude HAIKU_TOP src add-ons kernel drivers disk virtual nbd ;
SubInclude HAIKU_TOP src add-ons kernel drivers disk virtual remote_disk ; SubInclude HAIKU_TOP src add-ons kernel drivers disk virtual remote_disk ;
SubInclude HAIKU_TOP src add-ons kernel drivers disk virtual virtio_block ;
src/system/kernel/device_manager/device_manager.cpp
+2
View File
@@ -1552,6 +1552,7 @@ device_node::_GetNextDriverPath(void*& cookie, KPath& _path)
switch (subType) { switch (subType) {
case PCI_scsi: case PCI_scsi:
_AddPath(*stack, "busses", "scsi"); _AddPath(*stack, "busses", "scsi");
_AddPath(*stack, "busses", "virtio");
break; break;
case PCI_ide: case PCI_ide:
_AddPath(*stack, "busses", "ata"); _AddPath(*stack, "busses", "ata");
@@ -1583,6 +1584,7 @@ device_node::_GetNextDriverPath(void*& cookie, KPath& _path)
break; break;
case PCI_network: case PCI_network:
_AddPath(*stack, "drivers", "net"); _AddPath(*stack, "drivers", "net");
_AddPath(*stack, "busses", "virtio");
break; break;
case PCI_display: case PCI_display:
_AddPath(*stack, "drivers", "graphics"); _AddPath(*stack, "drivers", "graphics");