diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-01-25 14:26:21 +0000 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-02-12 09:43:00 +0000 |
| commit | ef71a987c1987f7543d3bf76ed9e5ce62f4d1daa (patch) | |
| tree | c672aa096c0088820c7ffa341b2d603cef6f66d6 /src/cpu/kvm | |
| parent | 9fbfb45e51e657b364334a1c96ba23698d181edb (diff) | |
| download | gem5-ef71a987c1987f7543d3bf76ed9e5ce62f4d1daa.tar.xz | |
python: Don't assume SimObjects live in the global namespace
The importer in Python 3 doesn't like the way we import SimObjects
from the global namespace. Convert the existing SimObject declarations
to import from m5.objects. As a side-effect, this makes these files
consistent with configuration files.
Change-Id: I11153502b430822130722839e1fa767b82a027aa
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/15981
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Diffstat (limited to 'src/cpu/kvm')
| -rw-r--r-- | src/cpu/kvm/BaseKvmCPU.py | 4 | ||||
| -rw-r--r-- | src/cpu/kvm/X86KvmCPU.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/cpu/kvm/BaseKvmCPU.py b/src/cpu/kvm/BaseKvmCPU.py index cb9bf481a..c9e64bd69 100644 --- a/src/cpu/kvm/BaseKvmCPU.py +++ b/src/cpu/kvm/BaseKvmCPU.py @@ -39,8 +39,8 @@ from m5.SimObject import * from m5.params import * from m5.proxy import * -from BaseCPU import BaseCPU -from KvmVM import KvmVM +from m5.objects.BaseCPU import BaseCPU +from m5.objects.KvmVM import KvmVM class BaseKvmCPU(BaseCPU): type = 'BaseKvmCPU' diff --git a/src/cpu/kvm/X86KvmCPU.py b/src/cpu/kvm/X86KvmCPU.py index 411db7dbe..a632bff3f 100644 --- a/src/cpu/kvm/X86KvmCPU.py +++ b/src/cpu/kvm/X86KvmCPU.py @@ -28,7 +28,8 @@ from m5.params import * from m5.SimObject import * -from BaseKvmCPU import BaseKvmCPU + +from m5.objects.BaseKvmCPU import BaseKvmCPU class X86KvmCPU(BaseKvmCPU): type = 'X86KvmCPU' |