diff -r 1c37f9911b8e -r faabb7eca047 configs/common/Benchmarks.py
--- a/configs/common/Benchmarks.py	Sat Jan 29 16:00:45 2011 -0800
+++ b/configs/common/Benchmarks.py	Sat Jan 29 16:03:20 2011 -0800
@@ -27,6 +27,7 @@
 # Authors: Ali Saidi
 
 from SysPaths import *
+from m5.defines import buildEnv
 
 class SysConfig:
     def __init__(self, script=None, mem=None, disk=None):
@@ -49,8 +50,14 @@
     def disk(self):
         if self.diskname:
             return disk(self.diskname)
+        elif buildEnv['TARGET_ISA'] == 'alpha':
+            return env.get('LINUX_IMAGE', disk('linux-latest.img'))
+        elif buildEnv['TARGET_ISA'] == 'x86':
+            return env.get('LINUX_IMAGE', disk('x86root.img'))
         else:
-            return env.get('LINUX_IMAGE', disk('linux-latest.img'))
+            print "Don't know what default disk image to use for ISA %s" % \
+                buildEnv['TARGET_ISA']
+            sys.exit(1)
 
 # Benchmarks are defined as a key in a dict which is a list of SysConfigs
 # The first defined machine is the test system, the others are driving systems
diff -r 1c37f9911b8e -r faabb7eca047 configs/common/FSConfig.py
--- a/configs/common/FSConfig.py	Sat Jan 29 16:00:45 2011 -0800
+++ b/configs/common/FSConfig.py	Sat Jan 29 16:03:20 2011 -0800
@@ -293,7 +293,6 @@
     if not mdesc:
         # generic system
         mdesc = SysConfig()
-    mdesc.diskname = 'x86root.img'
     self.readfile = mdesc.script()
 
     self.mem_mode = mem_mode