add etherdump file option

--HG--
extra : convert_revision : 6b62398778208bc4e64582e06fb73b71a94f3014

2 files changed, 10 insertions, 6 deletions

diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index e86cc05f5..193d3a5e5 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -83,14 +83,15 @@ def makeLinuxAlphaSystem(mem_mode, mdesc = None):
 
     return self
 
-def makeDualRoot(testSystem, driveSystem):
+def makeDualRoot(testSystem, driveSystem, dumpfile):
     self = Root()
     self.testsys = testSystem
     self.drivesys = driveSystem
-
-    self.etherdump = EtherDump(file='ethertrace')
     self.etherlink = EtherLink(int1 = Parent.testsys.tsunami.etherint[0],
-                               int2 = Parent.drivesys.tsunami.etherint[0],
-                               dump = Parent.etherdump)
+                               int2 = Parent.drivesys.tsunami.etherint[0])
+    if dumpfile:
+        self.etherdump = EtherDump(file=dumpfile)
+        self.etherlink.dump = Parent.etherdump
+
     self.clock = '1THz'
     return self
diff --git a/configs/example/fs.py b/configs/example/fs.py
index 7c888c536..958fc4353 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -47,6 +47,9 @@ parser.add_option("-b", "--benchmark", action="store", type="string",
                   dest="benchmark",
                   help="Specify the benchmark to run. Available benchmarks: %s"\
                           % DefinedBenchmarks)
+parser.add_option("--etherdump", action="store", type="string", dest="etherdump",
+                  help="Specify the filename to dump a pcap capture of the ethernet"
+                  "traffic")
 
 (options, args) = parser.parse_args()
 
@@ -90,7 +93,7 @@ if len(bm) == 2:
     s2 = makeLinuxAlphaSystem(mem_mode, bm[1])
     s2.cpu = cpu2
     cpu2.connectMemPorts(s2.membus)
-    root = makeDualRoot(s1, s2)
+    root = makeDualRoot(s1, s2, options.etherdump)
 elif len(bm) == 1:
     root = Root(clock = '1THz',
                 system = makeLinuxAlphaSystem(mem_mode, bm[0]))