6 files changed, 12 insertions, 16 deletions

diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc
index 6528bd81c..ecbb391ef 100644
--- a/src/dev/io_device.cc
+++ b/src/dev/io_device.cc
@@ -48,9 +48,9 @@ PioPort::recvAtomic(PacketPtr pkt)
 }
 
 void
-PioPort::getDeviceAddressRanges(AddrRangeList &resp, AddrRangeList &snoop)
+PioPort::getDeviceAddressRanges(AddrRangeList &resp, bool &snoop)
 {
-    snoop.clear();
+    snoop = false;
     device->addressRanges(resp);
 }
 
diff --git a/src/dev/io_device.hh b/src/dev/io_device.hh
index bd150bfe4..25bd2de8d 100644
--- a/src/dev/io_device.hh
+++ b/src/dev/io_device.hh
@@ -59,7 +59,7 @@ class PioPort : public SimpleTimingPort
     virtual Tick recvAtomic(PacketPtr pkt);
 
     virtual void getDeviceAddressRanges(AddrRangeList &resp,
-                                        AddrRangeList &snoop);
+                                        bool &snoop);
 
   public:
 
@@ -127,8 +127,8 @@ class DmaPort : public Port
     virtual void recvRetry() ;
 
     virtual void getDeviceAddressRanges(AddrRangeList &resp,
-                                        AddrRangeList &snoop)
-    { resp.clear(); snoop.clear(); }
+                                        bool &snoop)
+    { resp.clear(); snoop = false; }
 
     void queueDma(PacketPtr pkt, bool front = false);
     void sendDma();
diff --git a/src/dev/ns_gige.cc b/src/dev/ns_gige.cc
index d9985f808..e9d9c419d 100644
--- a/src/dev/ns_gige.cc
+++ b/src/dev/ns_gige.cc
@@ -1270,8 +1270,7 @@ NSGigE::cpuIntrPost(Tick when)
 
     if (intrEvent)
         intrEvent->squash();
-    intrEvent = new IntrEvent(this, true);
-    intrEvent->schedule(intrTick);
+    intrEvent = new IntrEvent(this, intrTick, true);
 }
 
 void
@@ -2770,8 +2769,7 @@ NSGigE::unserialize(Checkpoint *cp, const std::string &section)
     Tick intrEventTick;
     UNSERIALIZE_SCALAR(intrEventTick);
     if (intrEventTick) {
-        intrEvent = new IntrEvent(this, true);
-        intrEvent->schedule(intrEventTick);
+        intrEvent = new IntrEvent(this, intrEventTick, true);
     }
 }
 
diff --git a/src/dev/pcidev.cc b/src/dev/pcidev.cc
index f906e69cf..c2a2bc02d 100644
--- a/src/dev/pcidev.cc
+++ b/src/dev/pcidev.cc
@@ -76,9 +76,9 @@ PciDev::PciConfigPort::recvAtomic(PacketPtr pkt)
 
 void
 PciDev::PciConfigPort::getDeviceAddressRanges(AddrRangeList &resp,
-                                              AddrRangeList &snoop)
+                                              bool &snoop)
 {
-    snoop.clear();
+    snoop = false;;
     resp.push_back(RangeSize(configAddr, PCI_CONFIG_SIZE+1));
 }
 
diff --git a/src/dev/pcidev.hh b/src/dev/pcidev.hh
index 5044e2932..5ddbe84a0 100644
--- a/src/dev/pcidev.hh
+++ b/src/dev/pcidev.hh
@@ -89,7 +89,7 @@ class PciDev : public DmaDevice
         virtual Tick recvAtomic(PacketPtr pkt);
 
         virtual void getDeviceAddressRanges(AddrRangeList &resp,
-                                            AddrRangeList &snoop);
+                                            bool &snoop);
 
         Platform *platform;
 
diff --git a/src/dev/sinic.cc b/src/dev/sinic.cc
index 420761620..e13fdb0bc 100644
--- a/src/dev/sinic.cc
+++ b/src/dev/sinic.cc
@@ -630,8 +630,7 @@ Base::cpuIntrPost(Tick when)
 
     if (intrEvent)
         intrEvent->squash();
-    intrEvent = new IntrEvent(this, true);
-    intrEvent->schedule(intrTick);
+    intrEvent = new IntrEvent(this, intrTick, true);
 }
 
 void
@@ -1339,8 +1338,7 @@ Base::unserialize(Checkpoint *cp, const std::string &section)
     Tick intrEventTick;
     UNSERIALIZE_SCALAR(intrEventTick);
     if (intrEventTick) {
-        intrEvent = new IntrEvent(this, true);
-        intrEvent->schedule(intrEventTick);
+        intrEvent = new IntrEvent(this, intrEventTick, true);
     }
 }