Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/ser/m5

--HG--
extra : convert_revision : abe99bd7f4632eea51fba97273ac024f81b0ddae

1 files changed, 8 insertions, 3 deletions

diff --git a/sim/serialize.cc b/sim/serialize.cc
index 00321b932..f838acc8d 100644
--- a/sim/serialize.cc
+++ b/sim/serialize.cc
@@ -355,6 +355,10 @@ Param<string> serialize_file(&serialParams,
                              "file",
                              "file to write to", "");
 
+// Copy filename into regular string so we can export it without
+// having to include param.hh all over the place.
+string serializeFilename;
+
 SerializeParamContext::SerializeParamContext(const string &section)
     : ParamContext(section), event(NULL)
 { }
@@ -366,9 +370,10 @@ SerializeParamContext::~SerializeParamContext()
 void
 SerializeParamContext::checkParams()
 {
-    if (!((string)serialize_file).empty() && serialize_cycle > 0)
-    event = new SerializeEvent(&mainEventQueue, serialize_cycle,
-                               serialize_file);
+    serializeFilename = serialize_file;
+    if (!serializeFilename.empty() && serialize_cycle > 0)
+        event = new SerializeEvent(&mainEventQueue, serialize_cycle,
+                                   serializeFilename);
 }
 
 void