From 4e9448f19b86bf4bca0d79f6b2b7812e90457280 Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Tue, 13 Aug 2019 10:37:00 +0100 Subject: [PATCH] arm,kvm: Fix python imports from global namespace Change-Id: I31bd3563c2427efd7e520f714b1ca6f480fa4e85 Signed-off-by: Giacomo Travaglini Reviewed-by: Ciro Santilli Reviewed-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20491 Maintainer: Andreas Sandberg Tested-by: kokoro --- src/arch/arm/kvm/ArmKvmCPU.py | 2 +- src/arch/arm/kvm/ArmV8KvmCPU.py | 2 +- src/arch/arm/kvm/BaseArmKvmCPU.py | 2 +- src/arch/arm/kvm/KvmGic.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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' -- 2.30.2