summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--base/traceflags.py1
-rw-r--r--dev/ns_gige.cc1
-rw-r--r--dev/pktfifo.cc1
-rw-r--r--objects/Pci.mpy4
4 files changed, 4 insertions, 3 deletions
diff --git a/base/traceflags.py b/base/traceflags.py
index 8f20a9692..ef13d9e2a 100644
--- a/base/traceflags.py
+++ b/base/traceflags.py
@@ -139,6 +139,7 @@ compoundFlagMap = {
'ScsiAll' : [ 'ScsiDisk', 'ScsiCtrl', 'ScsiNone' ],
'DiskImageAll' : [ 'DiskImage', 'DiskImageRead', 'DiskImageWrite' ],
'EthernetAll' : [ 'Ethernet', 'EthernetPIO', 'EthernetDMA', 'EthernetData' , 'EthernetDesc', 'EthernetIntr', 'EthernetSM', 'EthernetCksum' ],
+ 'EthernetNoData' : [ 'Ethernet', 'EthernetPIO', 'EthernetDesc', 'EthernetIntr', 'EthernetSM', 'EthernetCksum' ],
'IdeAll' : [ 'IdeCtrl', 'IdeDisk' ]
}
diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc
index 613677875..db1474d1c 100644
--- a/dev/ns_gige.cc
+++ b/dev/ns_gige.cc
@@ -2383,6 +2383,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);
diff --git a/dev/pktfifo.cc b/dev/pktfifo.cc
index ae82123cf..79a96cc1d 100644
--- a/dev/pktfifo.cc
+++ b/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);
diff --git a/objects/Pci.mpy b/objects/Pci.mpy
index d6917b020..a7763139f 100644
--- a/objects/Pci.mpy
+++ b/objects/Pci.mpy
@@ -1,7 +1,7 @@
from Device import FooPioDevice, DmaDevice
simobj PciConfigData(FooPioDevice):
- addr = 0xffffffffffffffff
+ addr = 0xffffffffffffffffL
VendorID = Param.UInt16("Vendor ID")
DeviceID = Param.UInt16("Device ID")
Command = Param.UInt16(0, "Command")
@@ -47,4 +47,4 @@ simobj PciDevice(DmaDevice):
pci_func = Param.Int("PCI function code")
configdata = Param.PciConfigData(Super, "PCI Config data")
configspace = Param.PciConfigAll(Super, "PCI Configspace")
- addr = 0xffffffffffffffff
+ addr = 0xffffffffffffffffL