From a6d98140ca4afb23817a8d9ff24f8a001128b146 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Tue, 29 Oct 2019 16:00:24 +0000 Subject: 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 Maintainer: Giacomo Travaglini Tested-by: kokoro --- configs/example/fs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configs/example/fs.py') diff --git a/configs/example/fs.py b/configs/example/fs.py index e747b1aab..c9ae60e35 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -329,12 +329,12 @@ if options.benchmark: sys.exit(1) else: if options.dual: - bm = [SysConfig(disk=options.disk_image, rootdev=options.root_device, + bm = [SysConfig(disks=options.disk_image, rootdev=options.root_device, mem=options.mem_size, os_type=options.os_type), - SysConfig(disk=options.disk_image, rootdev=options.root_device, + SysConfig(disks=options.disk_image, rootdev=options.root_device, mem=options.mem_size, os_type=options.os_type)] else: - bm = [SysConfig(disk=options.disk_image, rootdev=options.root_device, + bm = [SysConfig(disks=options.disk_image, rootdev=options.root_device, mem=options.mem_size, os_type=options.os_type)] np = options.num_cpus -- cgit v1.2.3