From 04d1f61ae8f2a40cfe61aaf0c0271b212da0c314 Mon Sep 17 00:00:00 2001 From: Curtis Dunham Date: Wed, 5 Feb 2014 16:17:41 -0600 Subject: [PATCH] sim: bump checkpoint version for multiple event queues This patch adds a fix for older checkpoints before support for multiple event queues were added in changeset 2cce74fe359e. The change in checkpoint version should really hav ebeen part of the aforementioned changeset. --- src/sim/serialize.hh | 2 +- util/cpt_upgrader.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/sim/serialize.hh b/src/sim/serialize.hh index 05cb7c50f..2bf85bdf5 100644 --- a/src/sim/serialize.hh +++ b/src/sim/serialize.hh @@ -58,7 +58,7 @@ class EventQueue; * SimObject shouldn't cause the version number to increase, only changes to * existing objects such as serializing/unserializing more state, changing sizes * of serialized arrays, etc. */ -static const uint64_t gem5CheckpointVersion = 0x000000000000000b; +static const uint64_t gem5CheckpointVersion = 0x000000000000000c; template void paramOut(std::ostream &os, const std::string &name, const T ¶m); diff --git a/util/cpt_upgrader.py b/util/cpt_upgrader.py index 914de02b4..df3604754 100755 --- a/util/cpt_upgrader.py +++ b/util/cpt_upgrader.py @@ -569,6 +569,12 @@ def from_A(cpt): else: continue +# The change between versions C and D is the addition of support for multiple +# event queues, so for old checkpoints we must specify that there's only one. +def from_B(cpt): + cpt.set('Globals', 'numMainEventQueues', '1') + + migrations = [] migrations.append(from_0) migrations.append(from_1) @@ -581,6 +587,7 @@ migrations.append(from_7) migrations.append(from_8) migrations.append(from_9) migrations.append(from_A) +migrations.append(from_B) verbose_print = False -- 2.30.2