diff options
| author | Gabe Black <gabeblack@google.com> | 2019-10-14 15:31:26 -0700 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2019-10-25 22:42:31 +0000 |
| commit | a2a8dac5c2a26e91432415f409b55f04cff9c2e4 (patch) | |
| tree | 5cdd34c965e349953d361582923f6467fb209382 /src/cpu/kvm | |
| parent | fd030fd9f5893e1ce198bf760ab4a7f2704d921b (diff) | |
| download | gem5-a2a8dac5c2a26e91432415f409b55f04cff9c2e4.tar.xz | |
cpu: Access inst events through ThreadContext instead of the CPU.
Also delete the CPU interface.
Change-Id: I62a6b0a9a303d672f4083bdedf393f9f6d07331f
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22109
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'src/cpu/kvm')
| -rw-r--r-- | src/cpu/kvm/base.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cpu/kvm/base.cc b/src/cpu/kvm/base.cc index 384abb0eb..da3e87ee4 100644 --- a/src/cpu/kvm/base.cc +++ b/src/cpu/kvm/base.cc @@ -630,7 +630,7 @@ BaseKvmCPU::tick() case RunningServiceCompletion: case Running: { - const uint64_t nextInstEvent(nextInstEventCount(0)); + const uint64_t nextInstEvent(tc->nextInstEventCount()); // Enter into KVM and complete pending IO instructions if we // have an instruction event pending. const Tick ticksToExecute( @@ -686,7 +686,7 @@ BaseKvmCPU::tick() // Service any pending instruction events. The vCPU should // have exited in time for the event using the instruction // counter configured by setupInstStop(). - serviceInstCountEvents(0, ctrInsts); + tc->serviceInstCountEvents(ctrInsts); if (tryDrain()) _status = Idle; @@ -1346,7 +1346,7 @@ BaseKvmCPU::ioctlRun() void BaseKvmCPU::setupInstStop() { - Tick next = nextInstEventCount(0); + Tick next = tc->nextInstEventCount(); if (next == MaxTick) { setupInstCounter(0); } else { |