From: Giacomo Travaglini <giacomo.travaglini@arm.com>
Date: Tue, 13 Aug 2019 09:37:00 +0000 (+0100)
Subject: arm,kvm: Fix python imports from global namespace
X-Git-Tag: v19.0.0.0~607
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4e9448f19b86bf4bca0d79f6b2b7812e90457280;p=gem5.git

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 8af69d16b..d0db06355 100644
--- 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 13cf2d4db..1f7d69c67 100644
--- 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 f29c81190..7391cee81 100644
--- 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 19ae7f24e..ea7477874 100644
--- 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'