changeset ed89cb178ecd in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=ed89cb178ecd
description:
dist, dev: fix etherswitch upgrade script
The aforementioned upgrader in [1] assumes every option in [system]
has a delimiting '.', and also seems to do its rewriting work a bit too
unconditionally. Most checkpoints in the wild don't have this device,
in which case this script should be a safe no-op.
[1] 2aa4d7b dist, dev: Fixed the packet ordering in etherswitch
Change-Id: Icfd0350985109df1628eb9ab864cda42c54060a8
Reviewed-by: Gabor Dozsa <[email protected]>
diffstat:
util/cpt_upgraders/etherswitch.py | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diffs (33 lines):
diff -r 0eadb0b6e9de -r ed89cb178ecd util/cpt_upgraders/etherswitch.py
--- a/util/cpt_upgraders/etherswitch.py Mon Dec 19 11:03:28 2016 -0600
+++ b/util/cpt_upgraders/etherswitch.py Mon Dec 19 12:12:28 2016 -0600
@@ -4,18 +4,19 @@
options = cpt.items(sec)
for it in options:
opt_split = it[0].split('.')
+ if len(opt_split) < 2: continue
new_sec_name = opt_split[1]
old_opt_name = opt_split[len(opt_split) - 1]
if "outputFifo" in new_sec_name:
new_sec_name = new_sec_name.rstrip("outputFifo")
new_sec_name += ".outputFifo"
- new_sec_name = "system.system.%s" %(new_sec_name)
- if not cpt.has_section(new_sec_name):
- cpt.add_section(new_sec_name)
- if old_opt_name == "size":
- cpt.set(new_sec_name, "_size", it[1])
- elif old_opt_name == "packets":
- cpt.set(new_sec_name, "fifosize", it[1])
- else:
- cpt.set(new_sec_name, old_opt_name, it[1])
- cpt.remove_option(sec, it[0])
+ new_sec_name = "system.system.%s" %(new_sec_name)
+ if not cpt.has_section(new_sec_name):
+ cpt.add_section(new_sec_name)
+ if old_opt_name == "size":
+ cpt.set(new_sec_name, "_size", it[1])
+ elif old_opt_name == "packets":
+ cpt.set(new_sec_name, "fifosize", it[1])
+ else:
+ cpt.set(new_sec_name, old_opt_name, it[1])
+ cpt.remove_option(sec, it[0])
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
