From b829b4a8e4ef82345cf81d442dbc6c67016fde98 Mon Sep 17 00:00:00 2001 From: Curtis Dunham Date: Wed, 17 May 2017 21:34:04 +0000 Subject: kvm: move Kvm check from ARM Kvm GIC to System The check was nearly completely generic anyway, with the exception of the Kvm CPU type. This will make it easier for other parts of the codebase to do similar checks. Change-Id: Ibfdd3d65e9e6cc3041b53b73adfabee1999283da Reviewed-on: https://gem5-review.googlesource.com/3540 Reviewed-by: Andreas Sandberg Maintainer: Andreas Sandberg --- src/arch/arm/kvm/gic.cc | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'src/arch/arm/kvm/gic.cc') diff --git a/src/arch/arm/kvm/gic.cc b/src/arch/arm/kvm/gic.cc index 7cf4d07c6..498b79faa 100644 --- a/src/arch/arm/kvm/gic.cc +++ b/src/arch/arm/kvm/gic.cc @@ -189,7 +189,7 @@ void MuxingKvmGic::startup() { Pl390::startup(); - usingKvm = (kernelGic != nullptr) && validKvmEnvironment(); + usingKvm = (kernelGic != nullptr) && system.validKvmEnvironment(); if (usingKvm) fromPl390ToKvm(); } @@ -206,7 +206,7 @@ void MuxingKvmGic::drainResume() { Pl390::drainResume(); - bool use_kvm = (kernelGic != nullptr) && validKvmEnvironment(); + bool use_kvm = (kernelGic != nullptr) && system.validKvmEnvironment(); if (use_kvm != usingKvm) { // Should only occur due to CPU switches if (use_kvm) // from simulation to KVM emulation @@ -287,20 +287,6 @@ MuxingKvmGic::clearPPInt(uint32_t num, uint32_t cpu) kernelGic->clearPPI(cpu, num); } -bool -MuxingKvmGic::validKvmEnvironment() const -{ - if (system.threadContexts.empty()) - return false; - - for (auto tc : system.threadContexts) { - if (dynamic_cast(tc->getCpuPtr()) == nullptr) { - return false; - } - } - return true; -} - void MuxingKvmGic::copyDistRegister(BaseGicRegisters* from, BaseGicRegisters* to, ContextID ctx, Addr daddr) -- cgit v1.2.3