arm,kvm: Fix python imports from global namespace

Change-Id: I31bd3563c2427efd7e520f714b1ca6f480fa4e85
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20491
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/src/arch/arm/kvm/ArmKvmCPU.py b/src/arch/arm/kvm/ArmKvmCPU.py
index 8af69d16b6b4223a3f4db4399d10e4442e59665c..d0db06355b06a7b719e3348d048104f97abf6e5d 100644 (file)
--- a/src/arch/arm/kvm/ArmKvmCPU.py
+++ b/src/arch/arm/kvm/ArmKvmCPU.py
@@ -36,7 +36,7 @@
 # Authors: Andreas Sandberg
 
 from m5.params import *
-from BaseKvmCPU import BaseKvmCPU
+from m5.objects.BaseKvmCPU import BaseKvmCPU
 
 class ArmKvmCPU(BaseKvmCPU):
     type = 'ArmKvmCPU'

diff --git a/src/arch/arm/kvm/ArmV8KvmCPU.py b/src/arch/arm/kvm/ArmV8KvmCPU.py
index 13cf2d4db4bec1c64a20b7d61a3a21dc9cbb828a..1f7d69c67de83322c90489def3acd3bbfd8dcbdf 100644 (file)
--- a/src/arch/arm/kvm/ArmV8KvmCPU.py
+++ b/src/arch/arm/kvm/ArmV8KvmCPU.py
@@ -36,7 +36,7 @@
 # Authors: Andreas Sandberg
 
 from m5.params import *
-from BaseArmKvmCPU import BaseArmKvmCPU
+from m5.objects.BaseArmKvmCPU import BaseArmKvmCPU
 
 class ArmV8KvmCPU(BaseArmKvmCPU):
     type = 'ArmV8KvmCPU'

diff --git a/src/arch/arm/kvm/BaseArmKvmCPU.py b/src/arch/arm/kvm/BaseArmKvmCPU.py
index f29c811903d89717f7aa15f48572d121ebb212e2..7391cee813407d0815a1f778a433c791147281a1 100644 (file)
--- a/src/arch/arm/kvm/BaseArmKvmCPU.py
+++ b/src/arch/arm/kvm/BaseArmKvmCPU.py
@@ -36,7 +36,7 @@
 # Authors: Andreas Sandberg
 
 from m5.params import *
-from BaseKvmCPU import BaseKvmCPU
+from m5.objects.BaseKvmCPU import BaseKvmCPU
 
 class BaseArmKvmCPU(BaseKvmCPU):
     type = 'BaseArmKvmCPU'

diff --git a/src/arch/arm/kvm/KvmGic.py b/src/arch/arm/kvm/KvmGic.py
index 19ae7f24e7aa79392dc138c7f5b94fdab90db00c..ea74778749406a0adcd0153298243aecfa9da3e4 100644 (file)
--- a/src/arch/arm/kvm/KvmGic.py
+++ b/src/arch/arm/kvm/KvmGic.py
@@ -38,7 +38,7 @@
 from m5.params import *
 from m5.proxy import *
 
-from Gic import GicV2
+from m5.objects.Gic import GicV2
 
 class MuxingKvmGic(GicV2):
     type = 'MuxingKvmGic'