Error out if -s is used without --caches (instead of saying you must specify a
CPU).

--HG--
extra : convert_revision : a3b2bfbe7e037146ac08dd08834bf255da692506
diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index 3261594..08e700d 100644
--- a/configs/common/Simulation.py
+++ b/configs/common/Simulation.py
@@ -80,8 +80,8 @@
     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))")
+    if options.standard_switch and not options.caches:
+        m5.panic("Error: Must specify --caches when using --standard-switch")
 
     np = options.num_cpus
     max_checkpoints = options.max_checkpoints