summaryrefslogtreecommitdiff
path: root/src/arch/arm
diff options
context:
space:
mode:
authorCurtis Dunham <Curtis.Dunham@arm.com>2017-02-14 15:09:18 -0600
committerCurtis Dunham <Curtis.Dunham@arm.com>2017-02-14 15:09:18 -0600
commit41beacce088e8f682a0e8ac48f22a3fa4805a43b (patch)
tree3cd96b36acb9b38a2010eeae07f193a9d2292c73 /src/arch/arm
parentd3bfc03688e164c02e9c25730ada11b669c01eda (diff)
downloadgem5-41beacce088e8f682a0e8ac48f22a3fa4805a43b.tar.xz
sim, kvm: make KvmVM a System parameter
A KVM VM is typically a child of the System object already, but for solving future issues with configuration graph resolution, the most logical way to keep track of this object is for it to be an actual parameter of the System object. Change-Id: I965ded22203ff8667db9ca02de0042ff1c772220 Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/arch/arm')
-rw-r--r--src/arch/arm/kvm/KvmGic.py1
-rw-r--r--src/arch/arm/kvm/gic.cc3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/arm/kvm/KvmGic.py b/src/arch/arm/kvm/KvmGic.py
index 74bfe1e0b..9ae52db22 100644
--- a/src/arch/arm/kvm/KvmGic.py
+++ b/src/arch/arm/kvm/KvmGic.py
@@ -52,4 +52,3 @@ class KvmGic(BaseGic):
system = Param.System(Parent.any,
'System this interrupt controller belongs to')
- kvmVM = Param.KvmVM(Parent.any, 'KVM VM (i.e., shared memory domain)')
diff --git a/src/arch/arm/kvm/gic.cc b/src/arch/arm/kvm/gic.cc
index 684f026f0..c5a30879c 100644
--- a/src/arch/arm/kvm/gic.cc
+++ b/src/arch/arm/kvm/gic.cc
@@ -106,7 +106,8 @@ KvmKernelGicV2::setIntState(unsigned type, unsigned vcpu, unsigned irq,
KvmGic::KvmGic(const KvmGicParams *p)
: BaseGic(p),
system(*p->system),
- kernelGic(*p->kvmVM, p->cpu_addr, p->dist_addr, p->it_lines),
+ kernelGic(*system.getKvmVM(),
+ p->cpu_addr, p->dist_addr, p->it_lines),
addrRanges{kernelGic.distRange, kernelGic.cpuRange}
{
}