summaryrefslogtreecommitdiff
path: root/src/cpu/kvm
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2016-02-15 03:40:32 -0500
committerAndreas Hansson <andreas.hansson@arm.com>2016-02-15 03:40:32 -0500
commit0d50979888c1653e9ceb856c6bffa3f5062adeb9 (patch)
treedeb050fe28786751a76cdfaef40f4f79aaa72ba2 /src/cpu/kvm
parent407233f5d80d04e27234eb70750a7f6ee13acd4f (diff)
downloadgem5-0d50979888c1653e9ceb856c6bffa3f5062adeb9.tar.xz
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.
Diffstat (limited to 'src/cpu/kvm')
-rw-r--r--src/cpu/kvm/base.hh28
-rw-r--r--src/cpu/kvm/x86_cpu.hh18
2 files changed, 23 insertions, 23 deletions
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:
/**