2 files changed, 12 insertions, 7 deletions
diff --git a/src/python/m5/main.py b/src/python/m5/main.py
index 0bd5b431a..d02bc466b 100644
--- a/src/python/m5/main.py
+++ b/src/python/m5/main.py
@@ -268,7 +268,7 @@ def main():
         internal.debug.schedBreakCycle(int(when))
 
     for flag in options.trace_flags:
-        internal.trace.setFlag(flag)
+        internal.trace.set(flag)
 
     if options.trace_start is not None:
         internal.trace.enabled = False
@@ -276,8 +276,7 @@ def main():
             internal.event.enabled = True
         internal.event.create(enable_trace, options.trace_start)
 
-    #if options.trace_file is not None:
-    #    internal.trace.file(options.trace_file)
+    internal.trace.output(options.trace_file)
 
     for ignore in options.trace_ignore:
         internal.trace.ignore(ignore)
diff --git a/src/python/swig/trace.i b/src/python/swig/trace.i
index 5d1669d02..69b44c025 100644
--- a/src/python/swig/trace.i
+++ b/src/python/swig/trace.i
@@ -33,18 +33,23 @@
 %{
 #include "base/trace.hh"
 #include "sim/host.hh"
-#include "sim/trace_control.hh"
+
+inline void
+output(const char *filename)
+{
+    Trace::setOutput(filename);
+}
 
 inline void
 set(const char *flag)
 {
-    setTraceFlag(flag);
+    Trace::changeFlag(flag, true);
 }
 
 inline void
 clear(const char *flag)
 {
-    clearTraceFlag(flag);
+    Trace::changeFlag(flag, false);
 }
 
 inline void
@@ -57,9 +62,10 @@ using Trace::enabled;
 %}
 
 %inline %{
-extern void ignore(const char *expr);
+extern void output(const char *string);
 extern void set(const char *string);
 extern void clear(const char *string);
+extern void ignore(const char *expr);
 extern bool enabled;
 %}