From 5e5c705fbcecf4fbee2c64adee45b57ae976c11d Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Tue, 24 Oct 2017 14:08:05 +0200 Subject: [PATCH] init_smp.run: limit spawned init's for x86_32 --- repos/os/run/init_smp.run | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/repos/os/run/init_smp.run b/repos/os/run/init_smp.run index 177a45f8a..642acd303 100644 --- a/repos/os/run/init_smp.run +++ b/repos/os/run/init_smp.run @@ -20,7 +20,9 @@ if { [get_cmd_switch --autopilot] } { assert_spec nova # set specifically for our nightly test hardware */ - set cpus 8 + if {[have_spec x86_64]} { + set cpus 8 + } set children 3 } @@ -43,6 +45,9 @@ append config { + + + @@ -72,6 +77,9 @@ for { set i 0} { $i < ${cpus} } { incr i} { + + + @@ -94,7 +102,7 @@ install_config $config build_boot_image "core ld.lib.so init bomb timer" -append qemu_args " [expr 128 + $init_ram*$cpus] -nographic -smp $cpus" +append qemu_args " -m [expr 128 + $init_ram*$cpus]M -nographic -smp $cpus" if { [get_cmd_switch --autopilot] } {