qemu: sanity check misconfigured memory for okl4

Issue #4095
This commit is contained in:
Alexander Boettcher 2021-05-11 13:56:44 +02:00 committed by Christian Helmuth
parent d516544a1f
commit 1c20ed12c1
11 changed files with 29 additions and 16 deletions

View File

@ -456,7 +456,7 @@ proc prepare_to_run_genode { } {
set serial_id -1
set timeout 40
append qemu_args "-m 768 -nographic "
append qemu_args "-m 800 -nographic "
}

View File

@ -164,7 +164,6 @@ if {[have_include "power_on/qemu"]} {
#
# Qemu opts for supplying hdd_disk.raw as AHCI disk
#
append qemu_args " -m 128 "
append qemu_args " -nographic "
append qemu_args " -device ahci,id=ahci "
append qemu_args " -drive id=hdd,file=bin/hdd_disk.raw,format=raw,if=none -device ide-hd,drive=hdd,bus=ahci.1 "

View File

@ -4,7 +4,7 @@ source ${genode_dir}/repos/gems/run/sculpt.run
# enable Qemu networking, usable via the nic_drv
append_qemu_nic_args
append qemu_args " -m 768 "
append qemu_args " -m 1024 "
# attach small SATA disk to Qemu to experiment with file-system access
set disk_image "bin/sculpt-ahci.raw"

View File

@ -240,7 +240,7 @@ build_boot_image $boot_modules
# Execute test
#
append qemu_args " -m 512 -nographic "
append qemu_args " -nographic "
append_qemu_nic_args "hostfwd=tcp::5555-:22"
set lxip_match_string "ipaddr=(\[0-9\]+\.\[0-9\]+\.\[0-9\]+\.\[0-9\]+).*\n"

View File

@ -128,7 +128,7 @@ append boot_modules {
build_boot_image $boot_modules
append qemu_args " -m 768"
append qemu_args " -m 800"
run_genode_until forever

View File

@ -62,6 +62,6 @@ install_config {
build_boot_image { core init timer block_tester test-block_request_stream ld.lib.so }
append qemu_args " -nographic -m 512 "
append qemu_args " -nographic "
run_genode_until {.*child "block_tester" exited with exit value 0.*\n} 360

View File

@ -355,7 +355,7 @@ append_platform_drv_boot_modules
build_boot_image $boot_modules
append qemu_args " -nographic -m 512 -nographic"
append qemu_args " -nographic -nographic"
append qemu_args " -drive id=disk,file=bin/block0.raw,format=raw,if=none \
-drive id=disk2,file=bin/block1.raw,format=raw,if=none \
-device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 \

View File

@ -194,7 +194,7 @@ append_platform_drv_boot_modules
build_boot_image $boot_modules
append qemu_args " -nographic -m 512 "
append qemu_args " -nographic "
append qemu_args " -drive id=nvme0,file=bin/nvme.raw,format=raw,if=none "
append qemu_args " -device nvme,drive=nvme0,serial=fnord,id=nvme0n1 "

View File

@ -251,7 +251,7 @@ lappend boot_modules libc.lib.so vfs.lib.so vfs_pipe.lib.so vfs
build_boot_image $boot_modules
append qemu_args " -nographic -m 768 "
append qemu_args " -nographic -m 800 "
# wait until Noux started
run_genode_until {.*\[init -> vfs\] creating build directory\.\.\..*\n} $boot_timeout

View File

@ -309,7 +309,7 @@ if {[have_include "power_on/qemu"]} {
if {[expr $use_gui]} {
append qemu_args " -m 2048 "
} else {
append qemu_args " -m 768 "
append qemu_args " -m 1024 "
}
append qemu_args " -cpu phenom "

View File

@ -121,14 +121,28 @@ proc run_power_on { } {
# on x86, we support booting via pxe or iso/disk image
if {[have_board pc]} {
if {![regexp -- {-m} $qemu_args dummy]} {
if {[have_spec okl4]} {
# okl4 system integration specifies RAM from 32 to 800 MiB
append qemu_args " -m 800 "
} else {
append qemu_args " -m 512 "
if {[have_spec okl4]} {
# okl4 system integration specifies RAM from 32 to 800 MiB
set qemu_ram 800
} else {
set qemu_ram 512
}
if {[regexp -- {-m} $qemu_args dummy]} {
set qemu_ram [regexp -inline {\-m.[0-9]+} $qemu_args]
set qemu_ram [regexp -inline {[0-9]+} $qemu_ram]
}
if {[have_spec okl4]} {
if {$qemu_ram < 800} {
puts "Configured memory ($qemu_ram) for OKL4 on Qemu must be at least 800M\n"
exit 1
}
}
append qemu_args " -m $qemu_ram "
if {[have_include "load/tftp"]} {
append qemu_args " -boot n -tftp [run_dir] -bootp boot/pulsar -no-reboot -no-shutdown "
} else {