From 0d50979888c1653e9ceb856c6bffa3f5062adeb9 Mon Sep 17 00:00:00 2001
From: Andreas Hansson <andreas.hansson@arm.com>
Date: Mon, 15 Feb 2016 03:40:32 -0500
Subject: misc: Add missing overrides to appease clang

Since the last round of fixes a few new issues have snuck in. We
should consider switching the regression runs to clang.
---
 src/cpu/kvm/base.hh    | 28 ++++++++++++++--------------
 src/cpu/kvm/x86_cpu.hh | 18 +++++++++---------
 src/cpu/minor/lsq.hh   |  8 ++++----
 3 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'src/cpu')

diff --git a/src/cpu/kvm/base.hh b/src/cpu/kvm/base.hh
index d57ac3421..4aeed2286 100644
--- a/src/cpu/kvm/base.hh
+++ b/src/cpu/kvm/base.hh
@@ -80,9 +80,9 @@ 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(CheckpointOut &cp, ThreadID tid) const override;
     void unserializeThread(CheckpointIn &cp, ThreadID tid) override;
@@ -90,24 +90,24 @@ class BaseKvmCPU : public BaseCPU
     DrainState drain() override;
     void drainResume() 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(ThreadID tid = 0) override;
-    void activateContext(ThreadID thread_num);
-    void suspendContext(ThreadID thread_num);
+    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() const;
diff --git a/src/cpu/kvm/x86_cpu.hh b/src/cpu/kvm/x86_cpu.hh
index 14f16d544..7a1966965 100644
--- a/src/cpu/kvm/x86_cpu.hh
+++ b/src/cpu/kvm/x86_cpu.hh
@@ -44,7 +44,7 @@ class X86KvmCPU : public BaseKvmCPU
     X86KvmCPU(X86KvmCPUParams *params);
     virtual ~X86KvmCPU();
 
-    void startup();
+    void startup() override;
 
     /** @{ */
     void dump() const override;
@@ -61,7 +61,7 @@ class X86KvmCPU : public BaseKvmCPU
   protected:
     typedef std::vector<struct kvm_msr_entry> KvmMSRVector;
 
-    Tick kvmRun(Tick ticks);
+    Tick kvmRun(Tick ticks) override;
 
     /**
      * Run the virtual CPU until draining completes.
@@ -78,12 +78,12 @@ class X86KvmCPU : public BaseKvmCPU
      *
      * @return Number of ticks executed
      */
-    Tick kvmRunDrain();
+    Tick kvmRunDrain() override;
 
     /** Wrapper that synchronizes state in kvm_run */
     Tick kvmRunWrapper(Tick ticks);
 
-    uint64_t getHostCycles() const;
+    uint64_t getHostCycles() const override;
 
     /**
      * Methods to access CPUID information using the extended
@@ -132,8 +132,8 @@ class X86KvmCPU : public BaseKvmCPU
     void setVCpuEvents(const struct kvm_vcpu_events &events);
     /** @} */
 
-    void updateKvmState();
-    void updateThreadContext();
+    void updateKvmState() override;
+    void updateThreadContext() override;
 
     /**
      * Inject pending interrupts from gem5 into the virtual CPU.
@@ -143,9 +143,9 @@ class X86KvmCPU : public BaseKvmCPU
     /**
      * Handle x86 legacy IO (in/out)
      */
-    Tick handleKvmExitIO();
+    Tick handleKvmExitIO() override;
 
-    Tick handleKvmExitIRQWindowOpen();
+    Tick handleKvmExitIRQWindowOpen() override;
 
     /**
      * Check if there are pending events in the vCPU that prevents it
@@ -158,7 +158,7 @@ class X86KvmCPU : public BaseKvmCPU
      * @return False if there are pending events in the guest, True
      * otherwise.
      */
-    bool archIsDrained() const;
+    bool archIsDrained() const override;
 
   private:
     /**
diff --git a/src/cpu/minor/lsq.hh b/src/cpu/minor/lsq.hh
index 33d7c506b..09fb30d03 100644
--- a/src/cpu/minor/lsq.hh
+++ b/src/cpu/minor/lsq.hh
@@ -98,17 +98,17 @@ class LSQ : public Named
         { }
 
       protected:
-        bool recvTimingResp(PacketPtr pkt)
+        bool recvTimingResp(PacketPtr pkt) override
         { return lsq.recvTimingResp(pkt); }
 
-        void recvReqRetry() { lsq.recvReqRetry(); }
+        void recvReqRetry() override { lsq.recvReqRetry(); }
 
         bool isSnooping() const override { return true; }
 
-        void recvTimingSnoopReq(PacketPtr pkt)
+        void recvTimingSnoopReq(PacketPtr pkt) override
         { return lsq.recvTimingSnoopReq(pkt); }
 
-        void recvFunctionalSnoop(PacketPtr pkt) { }
+        void recvFunctionalSnoop(PacketPtr pkt) override { }
     };
 
     DcachePort dcachePort;
-- 
cgit v1.2.3