Configs: Make sure options don't conflict

--HG--
extra : convert_revision : dc9b91cf1d8e33c5e68d7faeb45dbe3e7038d14c

diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index 8ed6d6def3399823a48834902abd3e2f5609ca6a..3261594bd0704d7c535449cce620204ae245e250 100644 (file)
--- a/configs/common/Simulation.py
+++ b/configs/common/Simulation.py
@@ -77,6 +77,12 @@ def run(options, root, testsys, cpu_class):
     else:
         cptdir = getcwd()
 
+    if options.fast_forward and options.checkpoint_restore != None:
+        m5.panic("Error: Can't specify both --fast-forward and --checkpoint-restore")
+
+    if options.standard_switch and not cpu_class:
+        m5.panic("Error: Must specify CPU to switch to for --standard-switch (almost always detailed (-d))")
+
     np = options.num_cpus
     max_checkpoints = options.max_checkpoints
     switch_cpus = None