diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-01-25 14:26:21 +0000 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-02-12 09:43:00 +0000 |
| commit | ef71a987c1987f7543d3bf76ed9e5ce62f4d1daa (patch) | |
| tree | c672aa096c0088820c7ffa341b2d603cef6f66d6 /src/dev/pci | |
| parent | 9fbfb45e51e657b364334a1c96ba23698d181edb (diff) | |
| download | gem5-ef71a987c1987f7543d3bf76ed9e5ce62f4d1daa.tar.xz | |
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 <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/15981
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Diffstat (limited to 'src/dev/pci')
| -rw-r--r-- | src/dev/pci/CopyEngine.py | 3 | ||||
| -rw-r--r-- | src/dev/pci/PciDevice.py | 4 | ||||
| -rw-r--r-- | src/dev/pci/PciHost.py | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/dev/pci/CopyEngine.py b/src/dev/pci/CopyEngine.py index f1b9df1b9..1570365a6 100644 --- a/src/dev/pci/CopyEngine.py +++ b/src/dev/pci/CopyEngine.py @@ -29,7 +29,8 @@ from m5.SimObject import SimObject from m5.params import * from m5.proxy import * -from PciDevice import PciDevice + +from m5.objects.PciDevice import PciDevice class CopyEngine(PciDevice): type = 'CopyEngine' diff --git a/src/dev/pci/PciDevice.py b/src/dev/pci/PciDevice.py index 21e6edf62..3f41de181 100644 --- a/src/dev/pci/PciDevice.py +++ b/src/dev/pci/PciDevice.py @@ -41,8 +41,8 @@ from m5.SimObject import SimObject from m5.params import * from m5.proxy import * -from Device import DmaDevice -from PciHost import PciHost +from m5.objects.Device import DmaDevice +from m5.objects.PciHost import PciHost class PciDevice(DmaDevice): type = 'PciDevice' diff --git a/src/dev/pci/PciHost.py b/src/dev/pci/PciHost.py index 28405c198..607b5f392 100644 --- a/src/dev/pci/PciHost.py +++ b/src/dev/pci/PciHost.py @@ -39,8 +39,8 @@ from m5.SimObject import SimObject from m5.params import * from m5.proxy import * -from Device import PioDevice -from Platform import Platform +from m5.objects.Device import PioDevice +from m5.objects.Platform import Platform class PciHost(PioDevice): type = 'PciHost' |