Config: Add command line options for disk image and memory size

Added the options to Options.py for FS mode with backward compatibility. It is
good to provide an option to specify the disk image and the memory size from
command line since a lot of disk images are created to support different
benchmark suites as well as per user needs. Change in program also leads to
change in memory requirements. These options provide the interface to provide
both disk image and memory size from the command line and gives more
flexibility.

diff --git a/configs/common/Options.py b/configs/common/Options.py
index d22b3ab3c861b0ab4bb4deab8813ea20665d34dc..9413283f15756b29040c8c3c7a5eabf827966cea 100644 (file)
--- a/configs/common/Options.py
+++ b/configs/common/Options.py
@@ -171,3 +171,11 @@ def addFSOptions(parser):
     parser.add_option("--etherdump", action="store", type="string", dest="etherdump",
                       help="Specify the filename to dump a pcap capture of the" \
                       "ethernet traffic")
+
+    # Disk Image Options
+    parser.add_option("--disk-image", action="store", type="string", default=None,
+                      help="Path to the disk image to use.")
+
+    # Memory Size Options
+    parser.add_option("--mem-size", action="store", type="string", default=None,
+                      help="Path to the disk image to use.")

diff --git a/configs/example/fs.py b/configs/example/fs.py
index 38571fec35d695fe0989f193727c78a12497d026..33dc63af4a02d693f128f3319d691cb108265441 100644 (file)
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -86,9 +86,9 @@ if options.benchmark:
         sys.exit(1)
 else:
     if options.dual:
-        bm = [SysConfig(), SysConfig()]
+        bm = [SysConfig(disk=options.disk_image, mem=options.mem_size), SysConfig(disk=options.disk_image, mem=options.mem_size)]
     else:
-        bm = [SysConfig()]
+        bm = [SysConfig(disk=options.disk_image, mem=options.mem_size)]
 
 np = options.num_cpus
 

diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py
index 8f02b8cfd6d041125b166533edb7c18d98dfd7dd..35e485c7a9467d456434f2877bfc433c898098db 100644 (file)
--- a/configs/example/ruby_fs.py
+++ b/configs/example/ruby_fs.py
@@ -71,7 +71,7 @@ if options.benchmark:
         print "Valid benchmarks are: %s" % DefinedBenchmarks
         sys.exit(1)
 else:
-    bm = [SysConfig()]
+    bm = [SysConfig(disk=options.disk_image, mem=options.mem_size)]
 
 # Check for timing mode because ruby does not support atomic accesses
 if not (options.cpu_type == "detailed" or options.cpu_type == "timing"):