diff options
author | Lisa Hsu <hsul@eecs.umich.edu> | 2005-03-16 10:49:42 -0500 |
---|---|---|
committer | Lisa Hsu <hsul@eecs.umich.edu> | 2005-03-16 10:49:42 -0500 |
commit | bc6baa4049c285322fd0601a88c352fda1996dc1 (patch) | |
tree | a25c84a48af9185b06f5166ac386f8cedcdf3e3d /python/m5/objects/AlphaConsole.mpy | |
parent | 650306d5e5119e54190ce342e0b7afc182cd3c08 (diff) | |
parent | d80522183992207132e638ce2bb02513758bb61f (diff) | |
download | gem5-bc6baa4049c285322fd0601a88c352fda1996dc1.tar.xz |
Merge zizzer:/bk/m5
into zizzer.eecs.umich.edu:/.automount/zed/z/hsul/work/m5/pact05
--HG--
extra : convert_revision : e7ff23f6ac4e434d8b3117275df12fec03964a55
Diffstat (limited to 'python/m5/objects/AlphaConsole.mpy')
-rw-r--r-- | python/m5/objects/AlphaConsole.mpy | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/m5/objects/AlphaConsole.mpy b/python/m5/objects/AlphaConsole.mpy index 79918a01e..63aea5b7d 100644 --- a/python/m5/objects/AlphaConsole.mpy +++ b/python/m5/objects/AlphaConsole.mpy @@ -2,8 +2,8 @@ from Device import PioDevice simobj AlphaConsole(PioDevice): type = 'AlphaConsole' - cpu = Param.BaseCPU(Super, "Processor") + cpu = Param.BaseCPU(parent.any, "Processor") disk = Param.SimpleDisk("Simple Disk") num_cpus = Param.Int(1, "Number of CPUs") - sim_console = Param.SimConsole(Super, "The Simulator Console") - system = Param.BaseSystem(Super, "system object") + sim_console = Param.SimConsole(parent.any, "The Simulator Console") + system = Param.BaseSystem(parent.any, "system object") |