base: Fix gpu-compute output stream creation

[gem5.git] / src / cpu / kvm / base.hh

diff --git a/src/cpu/kvm/base.hh b/src/cpu/kvm/base.hh
index ce32cdbb1f9640677c1022d25a255d7cf01e01bf..dd27328be54b63b9c9783cbb6882508df99de27b 100644 (file)
--- a/src/cpu/kvm/base.hh
+++ b/src/cpu/kvm/base.hh
@@ -80,38 +80,38 @@ class BaseKvmCPU : public BaseCPU
     BaseKvmCPU(BaseKvmCPUParams *params);
     virtual ~BaseKvmCPU();
 
-    void init();
-    void startup();
-    void regStats();
+    void init() override;
+    void startup() override;
+    void regStats() override;
 
-    void serializeThread(std::ostream &os, ThreadID tid);
-    void unserializeThread(Checkpoint *cp, const std::string &section,
-                           ThreadID tid);
+    void serializeThread(CheckpointOut &cp, ThreadID tid) const override;
+    void unserializeThread(CheckpointIn &cp, ThreadID tid) override;
 
-    unsigned int drain(DrainManager *dm);
-    void drainResume();
+    DrainState drain() override;
+    void drainResume() override;
+    void notifyFork() override;
 
-    void switchOut();
-    void takeOverFrom(BaseCPU *cpu);
+    void switchOut() override;
+    void takeOverFrom(BaseCPU *cpu) override;
 
-    void verifyMemoryMode() const;
+    void verifyMemoryMode() const override;
 
-    MasterPort &getDataPort() { return dataPort; }
-    MasterPort &getInstPort() { return instPort; }
+    MasterPort &getDataPort() override { return dataPort; }
+    MasterPort &getInstPort() override { return instPort; }
 
-    void wakeup();
-    void activateContext(ThreadID thread_num);
-    void suspendContext(ThreadID thread_num);
+    void wakeup(ThreadID tid = 0) override;
+    void activateContext(ThreadID thread_num) override;
+    void suspendContext(ThreadID thread_num) override;
     void deallocateContext(ThreadID thread_num);
-    void haltContext(ThreadID thread_num);
+    void haltContext(ThreadID thread_num) override;
 
-    ThreadContext *getContext(int tn);
+    ThreadContext *getContext(int tn) override;
 
-    Counter totalInsts() const;
-    Counter totalOps() const;
+    Counter totalInsts() const override;
+    Counter totalOps() const override;
 
     /** Dump the internal state to the terminal. */
-    virtual void dump();
+    virtual void dump() const;
 
     /**
      * Force an exit from KVM.
@@ -748,13 +748,6 @@ class BaseKvmCPU : public BaseCPU
     /** Host factor as specified in the configuration */
     float hostFactor;
 
-    /**
-     * Drain manager to use when signaling drain completion
-     *
-     * This pointer is non-NULL when draining and NULL otherwise.
-     */
-    DrainManager *drainManager;
-
   public:
     /* @{ */
     Stats::Scalar numInsts;