diff options
| author | Curtis Dunham <Curtis.Dunham@arm.com> | 2016-12-19 12:12:28 -0600 |
|---|---|---|
| committer | Curtis Dunham <Curtis.Dunham@arm.com> | 2016-12-19 12:12:28 -0600 |
| commit | b7d072b2353038ea9d00d4ea536449295ab10839 (patch) | |
| tree | bce980c34b47b3c08988527d98b00922d501363a /util/cpt_upgraders | |
| parent | bc7ab6970a7ea9408853ed0eb278727214c41577 (diff) | |
| download | gem5-b7d072b2353038ea9d00d4ea536449295ab10839.tar.xz | |
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 <gabor.dozsa@arm.com>
Diffstat (limited to 'util/cpt_upgraders')
| -rw-r--r-- | util/cpt_upgraders/etherswitch.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/util/cpt_upgraders/etherswitch.py b/util/cpt_upgraders/etherswitch.py index e4094f97d..9cd82a2d0 100644 --- a/util/cpt_upgraders/etherswitch.py +++ b/util/cpt_upgraders/etherswitch.py @@ -4,18 +4,19 @@ def upgrader(cpt): 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]) |