summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/common/Options.py8
-rw-r--r--configs/example/fs.py4
-rw-r--r--configs/example/ruby_fs.py2
3 files changed, 11 insertions, 3 deletions
diff --git a/configs/common/Options.py b/configs/common/Options.py
index d22b3ab3c..9413283f1 100644
--- 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 38571fec3..33dc63af4 100644
--- 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 8f02b8cfd..35e485c7a 100644
--- 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"):