summaryrefslogtreecommitdiff
path: root/tests/configs/pc-simple-timing-ruby.py
diff options
context:
space:
mode:
authorCiro Santilli <ciro.santilli@arm.com>2019-10-29 16:00:24 +0000
committerGiacomo Travaglini <giacomo.travaglini@arm.com>2020-01-31 12:41:49 +0000
commita6d98140ca4afb23817a8d9ff24f8a001128b146 (patch)
tree11b3d8e28965441a47fc769b871674974cbe1879 /tests/configs/pc-simple-timing-ruby.py
parenta29aaa364b70a227ea0784f64e4082e08ce233a1 (diff)
downloadgem5-a6d98140ca4afb23817a8d9ff24f8a001128b146.tar.xz
configs: fs.py can take multiple disk images on most ISAs
All ISAs except SPARC can now take multiple disk images by passing the --disk-image option multiple times. Before this patch, several ISAs automatically mounted a secondary disk called "linux-bigswap2.img", which had to be in M5_PATH even if the end user did not want more than one disk. This was the case for for example for X86 but not ARM. This change was done to: * allow ARM to have a second disk image in fs.py, which was not possible, and allow other ISAs like X86 and ARM to take any number of disk images * provide a simpler, more intuitive CLI interface that does not require magic disk images to be present in M5_PATH to work for ISAs such as X86. Linux does not need that secondary image to boot correctly, so it is more friendly to support a minimal setup that requires the least amount of binaries to boot, and let supply the second image manually only if they need it. * make fs.py --disk-image work more similarly across all ISAs SPARC was left with a single disk only because its setup was a bit more complex and would require further testing. Change-Id: I8b6e08ae6daf0a5b6cd1d57d285a9677f01eb7ad Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23671 Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com> Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'tests/configs/pc-simple-timing-ruby.py')
-rw-r--r--tests/configs/pc-simple-timing-ruby.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/configs/pc-simple-timing-ruby.py b/tests/configs/pc-simple-timing-ruby.py
index ffac06266..7c7bf3369 100644
--- a/tests/configs/pc-simple-timing-ruby.py
+++ b/tests/configs/pc-simple-timing-ruby.py
@@ -51,7 +51,7 @@ options.l2_assoc=2
options.num_cpus = 2
#the system
-mdesc = SysConfig(disk = 'linux-x86.img')
+mdesc = SysConfig(disks = ['linux-x86.img'])
system = FSConfig.makeLinuxX86System('timing', options.num_cpus,
mdesc=mdesc, Ruby=True)
system.kernel = SysPaths.binary('x86_64-vmlinux-2.6.22.9')