From ef71a987c1987f7543d3bf76ed9e5ce62f4d1daa Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Fri, 25 Jan 2019 14:26:21 +0000 Subject: 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 Reviewed-on: https://gem5-review.googlesource.com/c/15981 Reviewed-by: Jason Lowe-Power Reviewed-by: Giacomo Travaglini --- src/dev/arm/RealView.py | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'src/dev/arm/RealView.py') diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py index d7ce9eba0..af19f3bbd 100644 --- a/src/dev/arm/RealView.py +++ b/src/dev/arm/RealView.py @@ -45,31 +45,32 @@ from m5.defines import buildEnv from m5.params import * from m5.proxy import * from m5.util.fdthelper import * -from ClockDomain import ClockDomain -from VoltageDomain import VoltageDomain -from Device import BasicPioDevice, PioDevice, IsaFake, BadAddr, DmaDevice -from PciHost import * -from Ethernet import NSGigE, IGbE_igb, IGbE_e1000 -from Ide import * -from Platform import Platform -from Terminal import Terminal -from Uart import Uart -from SimpleMemory import SimpleMemory -from Gic import * -from EnergyCtrl import EnergyCtrl -from ClockedObject import ClockedObject -from ClockDomain import SrcClockDomain -from SubSystem import SubSystem -from Graphics import ImageFormat -from ClockedObject import ClockedObject -from PS2 import * -from VirtIOMMIO import MmioVirtIO +from m5.objects.ClockDomain import ClockDomain +from m5.objects.VoltageDomain import VoltageDomain +from m5.objects.Device import \ + BasicPioDevice, PioDevice, IsaFake, BadAddr, DmaDevice +from m5.objects.PciHost import * +from m5.objects.Ethernet import NSGigE, IGbE_igb, IGbE_e1000 +from m5.objects.Ide import * +from m5.objects.Platform import Platform +from m5.objects.Terminal import Terminal +from m5.objects.Uart import Uart +from m5.objects.SimpleMemory import SimpleMemory +from m5.objects.Gic import * +from m5.objects.EnergyCtrl import EnergyCtrl +from m5.objects.ClockedObject import ClockedObject +from m5.objects.ClockDomain import SrcClockDomain +from m5.objects.SubSystem import SubSystem +from m5.objects.Graphics import ImageFormat +from m5.objects.ClockedObject import ClockedObject +from m5.objects.PS2 import * +from m5.objects.VirtIOMMIO import MmioVirtIO # Platforms with KVM support should generally use in-kernel GIC # emulation. Use a GIC model that automatically switches between # gem5's GIC model and KVM's GIC model if KVM is available. try: - from KvmGic import MuxingKvmGic + from m5.objects.KvmGic import MuxingKvmGic kvm_gicv2_class = MuxingKvmGic except ImportError: # KVM support wasn't compiled into gem5. Fallback to a -- cgit v1.2.3