From 41beacce088e8f682a0e8ac48f22a3fa4805a43b Mon Sep 17 00:00:00 2001 From: Curtis Dunham Date: Tue, 14 Feb 2017 15:09:18 -0600 Subject: 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 --- configs/example/fs.py | 4 ++-- configs/example/se.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'configs') diff --git a/configs/example/fs.py b/configs/example/fs.py index 1ada59084..8102edc75 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -143,7 +143,7 @@ def build_test_system(np): for i in xrange(np)] if is_kvm_cpu(TestCPUClass) or is_kvm_cpu(FutureClass): - test_sys.vm = KvmVM() + test_sys.kvm_vm = KvmVM() if options.ruby: # Check for timing mode because ruby does not support atomic accesses @@ -280,7 +280,7 @@ def build_drive_system(np): drive_sys.kernel = binary(options.kernel) if is_kvm_cpu(DriveCPUClass): - drive_sys.vm = KvmVM() + drive_sys.kvm_vm = KvmVM() drive_sys.iobridge = Bridge(delay='50ns', ranges = drive_sys.mem_ranges) diff --git a/configs/example/se.py b/configs/example/se.py index c48b99eb4..4adfe7bb8 100644 --- a/configs/example/se.py +++ b/configs/example/se.py @@ -209,7 +209,7 @@ for cpu in system.cpu: if is_kvm_cpu(CPUClass) or is_kvm_cpu(FutureClass): if buildEnv['TARGET_ISA'] == 'x86': - system.vm = KvmVM() + system.kvm_vm = KvmVM() for process in multiprocesses: process.useArchPT = True process.kvmInSE = True -- cgit v1.2.3