cpu: Fix drain issues in the Minor CPU

The drain refactor patches introduced a couple of bugs in the way
Minor handles draining. This patch fixes an incorrect assert and a
case of infinite recursion when the CPU signals drain done.

diff --git a/src/cpu/minor/cpu.cc b/src/cpu/minor/cpu.cc
index a93d0037da156f459a4b7e55379138ff5221b809..aefd5599d557c74178678f304431b881eae146f2 100644 (file)
--- a/src/cpu/minor/cpu.cc
+++ b/src/cpu/minor/cpu.cc
@@ -213,14 +213,12 @@ void
 MinorCPU::signalDrainDone()
 {
     DPRINTF(Drain, "MinorCPU drain done\n");
-    signalDrainDone();
+    Drainable::signalDrainDone();
 }
 
 void
 MinorCPU::drainResume()
 {
-    assert(drainState() == DrainState::Drained);
-
     if (switchedOut()) {
         DPRINTF(Drain, "drainResume while switched out.  Ignoring\n");
         return;