From 8c97726266a83fda31f8a68860157f195d7466ea Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Fri, 15 Apr 2011 10:44:59 -0700
Subject: python: cleanup python code so stuff doesn't automatically happen at
 startup this allows things to be overridden at startup (e.g. for tests)

---
 src/python/m5/simulate.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/python/m5/simulate.py')

diff --git a/src/python/m5/simulate.py b/src/python/m5/simulate.py
index cbcc00497..184c2c6f7 100644
--- a/src/python/m5/simulate.py
+++ b/src/python/m5/simulate.py
@@ -36,7 +36,6 @@ import sys
 import internal
 import core
 import stats
-from main import options
 import SimObject
 import ticks
 import objects
@@ -48,6 +47,8 @@ MaxTick = 2**63 - 1
 # The final hook to generate .ini files.  Called from the user script
 # once the config is built.
 def instantiate(ckpt_dir=None):
+    from main import options
+
     root = objects.Root.getInstance()
 
     if not root:
-- 
cgit v1.2.3