config: Add missing CPUs to --restore-with-cpu

The --restore-with-cpu option didn't use CpuConfig.cpu_names() to
determine which CPU names are valid, instead it used a static list of
known CPU names. This changeset makes the option parsing code use the
CPU list from the CpuConfig module instead.

diff --git a/configs/common/Options.py b/configs/common/Options.py
index e651e96ecfaa5352096fa100464480f0b702143a..f2bcbef0cd2b67caa660f59166c19ab571e5cb3a 100644 (file)
--- a/configs/common/Options.py
+++ b/configs/common/Options.py
@@ -136,8 +136,7 @@ def addCommonOptions(parser):
     parser.add_option("--work-cpus-checkpoint-count", action="store", type="int",
                       help="checkpoint and exit when active cpu count is reached")
     parser.add_option("--restore-with-cpu", action="store", type="choice",
-                      default="atomic", choices = ["atomic", "timing",
-                                                   "detailed", "inorder"],
+                      default="atomic", choices=CpuConfig.cpu_names(),
                       help = "cpu type for restoring from a checkpoint")