0df358a550
This patch fixes a regression with run/log_core introduced by
2064ffd64b nova: support multidimensional affinity space
The run tool uses a log message 'run_boot_string' to detect successful
boot as well as to detect unexpected reboots. This message should never
be logged twice and, thus, should not be part of the core_log. The patch
mentioned above moved the former run_boot_string after the core_log
initialization.
115 lines
3.1 KiB
Plaintext
115 lines
3.1 KiB
Plaintext
if {[have_spec linux]} {
|
|
puts "\n Run script is not supported on this platform. \n";
|
|
exit 0
|
|
}
|
|
if {[get_cmd_switch --autopilot] && ![have_include "power_on/qemu"]} {
|
|
puts "\n Run script is not supported on this platform. \n";
|
|
exit 0
|
|
}
|
|
|
|
proc log_service { } {
|
|
if { [get_cmd_switch --autopilot] } { return log }
|
|
return ram
|
|
}
|
|
|
|
if {[have_spec nova]} {
|
|
proc kernel_output { } { return "novga logmem" }
|
|
}
|
|
|
|
build "core init timer server/vfs server/fs_log app/log_core"
|
|
|
|
create_boot_directory
|
|
|
|
append config {
|
|
<config>
|
|
<parent-provides>
|
|
<service name="CPU"/>
|
|
<service name="IO_PORT"/>
|
|
<service name="IRQ"/>
|
|
<service name="LOG"/>
|
|
<service name="PD"/>
|
|
<service name="RAM"/>
|
|
<service name="ROM"/>
|
|
</parent-provides>
|
|
<default-route>
|
|
<any-service> <parent/> </any-service>
|
|
</default-route>
|
|
|
|
<default caps="100"/>
|
|
|
|
<start name="timer">
|
|
<resource name="CPU" quantum="10"/>
|
|
<resource name="RAM" quantum="1M"/>
|
|
<provides><service name="Timer"/></provides>
|
|
</start>
|
|
|
|
<start name="vfs">
|
|
<resource name="RAM" quantum="2M"/>
|
|
<provides><service name="File_system"/></provides>
|
|
<config>
|
|
<vfs>
|
|
<!-- be careful to avoid endless output loop for core.log -->
|
|
<dir name="log_core"> <} [log_service] { name="log.log"/> </dir>
|
|
</vfs>
|
|
<policy label_prefix="fs_log" writeable="yes" root="/"/>
|
|
</config>
|
|
</start>
|
|
|
|
<start name="fs_log">
|
|
<resource name="RAM" quantum="2M"/>
|
|
<provides><service name="LOG"/></provides>
|
|
<config>
|
|
<policy label="log_core -> log"/>
|
|
</config>
|
|
<route>
|
|
<service name="File_system"> <child name="vfs"/> </service>
|
|
<any-service> <parent/> </any-service>
|
|
</route>
|
|
</start>
|
|
|
|
<start name="log_core">
|
|
<resource name="RAM" quantum="10M"/>
|
|
<config period_ms="2000"/>
|
|
<route>
|
|
<service name="ROM" unscoped_label="log_core"> <parent/> </service>
|
|
<service name="ROM" unscoped_label="ld.lib.so"> <parent/> </service>
|
|
<service name="ROM" label="log"> <parent label="core_log"/> </service>
|
|
<service name="Timer"> <child name="timer"/> </service>
|
|
<service name="LOG" label="log"> <child name="fs_log"/> </service>
|
|
<service name="PD"> <parent/> </service>
|
|
<service name="CPU"> <parent/> </service>
|
|
<service name="LOG"> <parent/> </service>
|
|
</route>
|
|
</start>}
|
|
|
|
append_if [have_spec nova] config {
|
|
<start name="log_kernel">
|
|
<binary name="log_core"/>
|
|
<resource name="RAM" quantum="10M"/>
|
|
<config period_ms="2000"/>
|
|
<route>
|
|
<service name="ROM" unscoped_label="log_core"> <parent/> </service>
|
|
<service name="ROM" unscoped_label="ld.lib.so"> <parent/> </service>
|
|
<service name="ROM" label="log"> <parent label="kernel_log"/> </service>
|
|
<service name="Timer"> <child name="timer"/> </service>
|
|
<service name="PD"> <parent/> </service>
|
|
<service name="CPU"> <parent/> </service>
|
|
<service name="LOG"> <parent/> </service>
|
|
</route>
|
|
</start>}
|
|
|
|
append config {
|
|
</config>}
|
|
|
|
install_config $config
|
|
|
|
build_boot_image "core init timer ld.lib.so vfs fs_log log_core vfs.lib.so"
|
|
|
|
append qemu_args " -nographic "
|
|
|
|
if { [get_cmd_switch --autopilot] } {
|
|
run_genode_until {.*\[init -> vfs] \[.*\n} 20
|
|
} else {
|
|
run_genode_until forever
|
|
}
|