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/x86/Pc.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/dev/x86/Pc.py') diff --git a/src/dev/x86/Pc.py b/src/dev/x86/Pc.py index 4d20214ad..0e75a2e51 100644 --- a/src/dev/x86/Pc.py +++ b/src/dev/x86/Pc.py @@ -29,12 +29,12 @@ from m5.params import * from m5.proxy import * -from Device import IsaFake -from Platform import Platform -from SouthBridge import SouthBridge -from Terminal import Terminal -from Uart import Uart8250 -from PciHost import GenericPciHost +from m5.objects.Device import IsaFake +from m5.objects.Platform import Platform +from m5.objects.SouthBridge import SouthBridge +from m5.objects.Terminal import Terminal +from m5.objects.Uart import Uart8250 +from m5.objects.PciHost import GenericPciHost def x86IOAddress(port): IO_address_space_base = 0x8000000000000000 -- cgit v1.2.3