The ide_ctrl serialize and unserialize were broken.

Multiple channels were saving their state under the
same name. This patch separates the saved state of
the primary and secondary channel.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/dev/ide_ctrl.hh b/src/dev/ide_ctrl.hh
index 6a71a6640..89dc1ee9d 100644
--- a/src/dev/ide_ctrl.hh
+++ b/src/dev/ide_ctrl.hh
@@ -111,10 +111,13 @@ class IdeController : public PciDev
         Channel(std::string newName, Addr _cmdSize, Addr _ctrlSize);
         ~Channel();
 
-        void serialize(std::ostream &os);
-        void unserialize(Checkpoint *cp, const std::string &section);
+        void serialize(const std::string &base, std::ostream &os);
+        void unserialize(const std::string &base, Checkpoint *cp,
+            const std::string &section);
+    };
 
-    } primary, secondary;
+    Channel primary;
+    Channel secondary;
 
     /** Bus master interface (BMI) registers */
     Addr bmiAddr, bmiSize;