seoul: support ide disk model

Issue #1702
This commit is contained in:
Alexander Boettcher 2015-09-09 23:38:07 +02:00 committed by Christian Helmuth
parent 36947cef3a
commit f7ad6cf4e6
8 changed files with 22 additions and 1 deletions

View File

@ -11,6 +11,8 @@ assert_spec nova
set use_multiboot 1
set use_genode_iso 0
set use_model_ahci 0
set use_model_ide 0
set use_block_ram 0
set use_block_sata 0

View File

@ -9,6 +9,8 @@
set use_multiboot 0
set use_genode_iso 0
set use_model_ahci 1
set use_model_ide 0
set use_block_ram 1
set use_block_sata 0

View File

@ -12,6 +12,8 @@
set use_multiboot 1
set use_genode_iso 0
set use_model_ahci 0
set use_model_ide 0
set use_block_ram 0
set use_block_sata 0

View File

@ -10,6 +10,8 @@
set use_multiboot 1
set use_genode_iso 1
set use_model_ahci 1
set use_model_ide 0
set use_block_ram 0
set use_block_sata 0

View File

@ -16,6 +16,8 @@ if {[have_include power_on/qemu]} {
set use_multiboot 1
set use_genode_iso 0
set use_model_ahci 0
set use_model_ide 0
set use_block_ram 0
set use_block_sata 0

View File

@ -9,6 +9,8 @@
set use_multiboot 1
set use_genode_iso 0
set use_model_ahci 0
set use_model_ide 0
set use_block_ram 0
set use_block_sata 0

View File

@ -103,9 +103,17 @@ for {set i 0} {$i < $vcpus_to_be_used} {incr i 1} {
}
if {!$use_multiboot} {
puts $vm_cfg_fd {
if {$use_model_ahci} {
puts $vm_cfg_fd {
<ahci mem="0xe0800000" irq="14" bdf="0x30"/>
<drive sigma0drive="0" controller="0" port="0"/>
}
}
if {$use_model_ide} {
puts $vm_cfg_fd {
<ide port0="0x1f0" port1="0x3f6" irq="14" bdf="0x38" disk="0"/>
}
}
}

View File

@ -82,6 +82,7 @@ MODEL_INFO(pmtimer, "io_port")
MODEL_INFO(pcihostbridge, "bus_num", "bus_count", "io_base", "mem_base")
MODEL_INFO(intel82576vf, "promisc", "mem_mmio", "mem_msix", "txpoll_us", "rx_map")
MODEL_INFO(ide, "port0", "port1", "irq", "bdf", "disk")
MODEL_INFO(ahci, "mem", "irq", "bdf")
MODEL_INFO(drive, "sigma0drive", "controller", "port")