Merge zizzer.eecs.umich.edu:/bk/m5

into zamp.eecs.umich.edu:/z/ktlim2/m5-patched/m5-new

--HG--
extra : convert_revision : 3b9413a6861eaddb8de753d76e217106d41cc347

dev/ns_gige.cc

@@ -2352,6 +2352,7 @@ NSGigE::serialize(ostream &os)
     bool txPacketExists = txPacket;
     SERIALIZE_SCALAR(txPacketExists);
     if (txPacketExists) {
+        txPacket->length = txPacketBufPtr - txPacket->data;
         txPacket->serialize("txPacket", os);
         uint32_t txPktBufPtr = (uint32_t) (txPacketBufPtr - txPacket->data);
         SERIALIZE_SCALAR(txPktBufPtr);

dev/pktfifo.cc

@@ -60,7 +60,6 @@ PacketFifo::unserialize(const string &base, Checkpoint *cp,
     paramIn(cp, section, base + ".packets", fifosize);
 
     fifo.clear();
-    fifo.resize(fifosize);
 
     for (int i = 0; i < fifosize; ++i) {
         PacketPtr p = new PacketData(16384);