From f7ad6cf4e6d797fc2f581703a43430d06d5966f3 Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Wed, 9 Sep 2015 23:38:07 +0200 Subject: [PATCH] seoul: support ide disk model Issue #1702 --- repos/ports/run/seoul-auto.run | 2 ++ repos/ports/run/seoul-disc.run | 2 ++ repos/ports/run/seoul-fancy.run | 2 ++ repos/ports/run/seoul-genode.run | 2 ++ repos/ports/run/seoul-kernelbuild.run | 2 ++ repos/ports/run/seoul-net.run | 2 ++ repos/ports/run/seoul.inc | 10 +++++++++- repos/ports/src/app/seoul/device_model_registry.cc | 1 + 8 files changed, 22 insertions(+), 1 deletion(-) diff --git a/repos/ports/run/seoul-auto.run b/repos/ports/run/seoul-auto.run index dd9f845d8a..22b07067c0 100644 --- a/repos/ports/run/seoul-auto.run +++ b/repos/ports/run/seoul-auto.run @@ -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 diff --git a/repos/ports/run/seoul-disc.run b/repos/ports/run/seoul-disc.run index 58e933530d..2f468d1928 100644 --- a/repos/ports/run/seoul-disc.run +++ b/repos/ports/run/seoul-disc.run @@ -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 diff --git a/repos/ports/run/seoul-fancy.run b/repos/ports/run/seoul-fancy.run index 883d18c961..bbb7f91f19 100644 --- a/repos/ports/run/seoul-fancy.run +++ b/repos/ports/run/seoul-fancy.run @@ -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 diff --git a/repos/ports/run/seoul-genode.run b/repos/ports/run/seoul-genode.run index 2691c4fe24..9a07ec2799 100644 --- a/repos/ports/run/seoul-genode.run +++ b/repos/ports/run/seoul-genode.run @@ -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 diff --git a/repos/ports/run/seoul-kernelbuild.run b/repos/ports/run/seoul-kernelbuild.run index 0e32422b8a..2d08e59bc5 100644 --- a/repos/ports/run/seoul-kernelbuild.run +++ b/repos/ports/run/seoul-kernelbuild.run @@ -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 diff --git a/repos/ports/run/seoul-net.run b/repos/ports/run/seoul-net.run index 9f264c744c..a89dd9539e 100644 --- a/repos/ports/run/seoul-net.run +++ b/repos/ports/run/seoul-net.run @@ -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 diff --git a/repos/ports/run/seoul.inc b/repos/ports/run/seoul.inc index 5476b0af72..4ec85a79e2 100644 --- a/repos/ports/run/seoul.inc +++ b/repos/ports/run/seoul.inc @@ -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 { + } + } + if {$use_model_ide} { + puts $vm_cfg_fd { + + } } } diff --git a/repos/ports/src/app/seoul/device_model_registry.cc b/repos/ports/src/app/seoul/device_model_registry.cc index 8a3a3c5cf4..783ff1b7e9 100644 --- a/repos/ports/src/app/seoul/device_model_registry.cc +++ b/repos/ports/src/app/seoul/device_model_registry.cc @@ -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")