diff options
| author | Christian Geddes <crgeddes@us.ibm.com> | 2019-06-26 17:02:30 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-07-10 13:32:59 -0500 |
| commit | ca15d68452e8ad54f73c3f1c1247ba70eda8a56d (patch) | |
| tree | 0ed8d7abc7db89f6b01aa5729f852592c2018470 /src/build | |
| parent | b0decd01a99a34ac23a3effe49448bd46a77b7dd (diff) | |
| download | talos-hostboot-ca15d68452e8ad54f73c3f1c1247ba70eda8a56d.tar.gz talos-hostboot-ca15d68452e8ad54f73c3f1c1247ba70eda8a56d.zip | |
Start simics in vexec for Axone by default
Previously when you called 'hb startsimics' with the axone config
we were not running in a vexec shell. This was causing the pool
machines to crater if people were running 1 or 2 simics sessions.
This commit will check if the '-nre' flag has been passed in, or
if we are in a vexec shell already. If niether of those are true
then we will boot simics in a vexec shell, if they are -nre has
been passed or we are already inside a vexec then we will not boot
simics inside a vexec.
Change-Id: I17895bb109f18bbcc4b0daafe6c864531bf5994a
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/79573
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Reviewed-by: Chen Du <duchen@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/build')
| -rwxr-xr-x | src/build/tools/hb | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/build/tools/hb b/src/build/tools/hb index e086ad5b0..ce8f744e3 100755 --- a/src/build/tools/hb +++ b/src/build/tools/hb @@ -427,11 +427,19 @@ hb_startsimics() #export MYDIR=$bb/obj/ppc/hbfw/simics/startup.simics #then /runsim -m axone -o hb_script_to_run=$MYDIR export MY_DIR="${SANDBOXBASE}/obj/ppc/simu/scripts/hbfw" - export RUNSIMCMD="cd ${SANDBOXBASE}/simics/ && ./runsim -m ${MACHINE} hb_script_to_run=${MY_DIR}/startup.simics pnor_img=${MY_DIR}/../../../hbfw/img/axone.pnor sbe_seeprom_img=${SANDBOXBASE}/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 enable_lpc_console=TRUE" - echo "********** + # If '-nre' was passed in as a flag, then do not vexec + # also, if $POOL is defined, this indicates are already in + # a vexec shell so do not vexec + if [ "$*" = "-nre" ] || [ ! -z ${POOL} ]; then + VEXEC_STR=" vexec" + else + VEXEC_STR="" + fi + export RUNSIMCMD="cd ${SANDBOXBASE}/simics/ &&${VEXEC_STR} ./runsim -m ${MACHINE} hb_script_to_run=${MY_DIR}/startup.simics pnor_img=${MY_DIR}/../../../hbfw/img/axone.pnor sbe_seeprom_img=${SANDBOXBASE}/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 enable_lpc_console=TRUE" + echo "**********" echo $RUNSIMCMD - echo "********** - execute_in_sandbox "${RUNSIMCMD} ${SIMICSOPTIONS} $*" "ppc" + echo "**********" + execute_in_sandbox "${RUNSIMCMD} ${SIMICSOPTIONS}" "ppc" else execute_in_sandbox \ "start_simics -machine ${MACHINE} ${SIMICSOPTIONS} $*" "ppc" |
