From 49f64a0cac8494b643a5b4bcca9274244187d44b Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Thu, 5 Apr 2018 15:16:06 +0200 Subject: [PATCH] run: adapt qemu RAM size for okl4/x86 Our static okl4 system-integration configuration specifies a fixed RAM range from 32 to 800 MiB, which must be satisfied by Qemu or strange errors happen due to accesses beyond RAM. (Fixes current issues with nic_router.run.) --- tool/run/power_on/qemu | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tool/run/power_on/qemu b/tool/run/power_on/qemu index e35a200f3..c41879099 100644 --- a/tool/run/power_on/qemu +++ b/tool/run/power_on/qemu @@ -107,7 +107,12 @@ proc run_power_on { } { # on x86, we support booting via pxe or iso/disk image if {[have_spec x86]} { if {![regexp -- {-m} $qemu_args dummy]} { - append qemu_args " -m 512 " + 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_include "load/tftp"]} { append qemu_args " -boot n -tftp [run_dir] -bootp boot/pulsar -no-reboot -no-shutdown "