8 files changed, 11 insertions, 8 deletions

diff --git a/src/cpu/o3/fetch.hh b/src/cpu/o3/fetch.hh
index 3ada0328f..d954bd1e7 100644
--- a/src/cpu/o3/fetch.hh
+++ b/src/cpu/o3/fetch.hh
@@ -80,8 +80,8 @@ class DefaultFetch
 
       public:
         /** Default constructor. */
-        IcachePort(DefaultFetch<Impl> *_fetch, O3CPU *_cpu)
-            : Port(_fetch->name() + "-iport", _cpu), fetch(_fetch)
+        IcachePort(DefaultFetch<Impl> *_fetch)
+            : Port(_fetch->name() + "-iport"), fetch(_fetch)
         { }
 
         bool snoopRangeSent;
diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
index ecfbacd98..7d344fa33 100644
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@ -167,7 +167,7 @@ DefaultFetch<Impl>::DefaultFetch(O3CPU *_cpu, Params *params)
     instSize = sizeof(TheISA::MachInst);
 
     // Name is finally available, so create the port.
-    icachePort = new IcachePort(this, cpu);
+    icachePort = new IcachePort(this);
 
     icachePort->snoopRangeSent = false;
 
diff --git a/src/cpu/o3/lsq.hh b/src/cpu/o3/lsq.hh
index 82d73c6ee..06de608e0 100644
--- a/src/cpu/o3/lsq.hh
+++ b/src/cpu/o3/lsq.hh
@@ -296,8 +296,8 @@ class LSQ {
 
       public:
         /** Default constructor. */
-        DcachePort(LSQ *_lsq, O3CPU *_cpu)
-            : Port(_lsq->name() + "-dport", _cpu), lsq(_lsq)
+        DcachePort(LSQ *_lsq)
+            : Port(_lsq->name() + "-dport"), lsq(_lsq)
         { }
 
         bool snoopRangeSent;
diff --git a/src/cpu/o3/lsq_impl.hh b/src/cpu/o3/lsq_impl.hh
index 41ab66dd0..8ed6f7f54 100644
--- a/src/cpu/o3/lsq_impl.hh
+++ b/src/cpu/o3/lsq_impl.hh
@@ -112,7 +112,7 @@ LSQ<Impl>::DcachePort::recvRetry()
 
 template <class Impl>
 LSQ<Impl>::LSQ(O3CPU *cpu_ptr, IEW *iew_ptr, Params *params)
-    : cpu(cpu_ptr), iewStage(iew_ptr), dcachePort(this, cpu_ptr),
+    : cpu(cpu_ptr), iewStage(iew_ptr), dcachePort(this),
       LQEntries(params->LQEntries),
       SQEntries(params->SQEntries),
       numThreads(params->numberOfThreads),
diff --git a/src/cpu/o3/thread_context_impl.hh b/src/cpu/o3/thread_context_impl.hh
index 514d3de64..865d58635 100755
--- a/src/cpu/o3/thread_context_impl.hh
+++ b/src/cpu/o3/thread_context_impl.hh
@@ -103,6 +103,7 @@ void
 O3ThreadContext<Impl>::delVirtPort(VirtualPort *vp)
 {
     if (vp != thread->getVirtPort()) {
+        vp->removeConn();
         delete vp;
     }
 }
diff --git a/src/cpu/ozone/cpu_impl.hh b/src/cpu/ozone/cpu_impl.hh
index 4cb55fa23..0c7105382 100644
--- a/src/cpu/ozone/cpu_impl.hh
+++ b/src/cpu/ozone/cpu_impl.hh
@@ -747,6 +747,7 @@ template <class Impl>
 void
 OzoneCPU<Impl>::OzoneTC::delVirtPort(VirtualPort *vp)
 {
+    vp->removeConn();
     delete vp;
 }
 #endif
diff --git a/src/cpu/simple_thread.cc b/src/cpu/simple_thread.cc
index 47b69d05f..5a5444de4 100644
--- a/src/cpu/simple_thread.cc
+++ b/src/cpu/simple_thread.cc
@@ -302,6 +302,7 @@ void
 SimpleThread::delVirtPort(VirtualPort *vp)
 {
     if (vp != virtPort) {
+        vp->removeConn();
         delete vp;
     }
 }
diff --git a/src/cpu/thread_state.cc b/src/cpu/thread_state.cc
index 56839ca7f..bcfc9c924 100644
--- a/src/cpu/thread_state.cc
+++ b/src/cpu/thread_state.cc
@@ -126,7 +126,7 @@ ThreadState::connectPhysPort()
     // already existed.  Fix this memory leak once the bus port IDs
     // for functional ports is resolved.
     if (physPort)
-        physPort->disconnectFromPeer();
+        physPort->removeConn();
     else
         physPort = new FunctionalPort(csprintf("%s-%d-funcport",
                                            baseCpu->name(), tid));
@@ -140,7 +140,7 @@ ThreadState::connectVirtPort()
     // already existed.  Fix this memory leak once the bus port IDs
     // for functional ports is resolved.
     if (virtPort)
-        virtPort->disconnectFromPeer();
+        virtPort->removeConn();
     else
         virtPort = new VirtualPort(csprintf("%s-%d-vport",
                                         baseCpu->name(), tid));