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/virtio | |
| 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/virtio')
| -rw-r--r-- | src/dev/virtio/VirtIO.py | 4 | ||||
| -rw-r--r-- | src/dev/virtio/VirtIO9P.py | 2 | ||||
| -rw-r--r-- | src/dev/virtio/VirtIOBlock.py | 2 | ||||
| -rw-r--r-- | src/dev/virtio/VirtIOConsole.py | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/dev/virtio/VirtIO.py b/src/dev/virtio/VirtIO.py index bf050fd47..fcb9235ec 100644 --- a/src/dev/virtio/VirtIO.py +++ b/src/dev/virtio/VirtIO.py @@ -40,8 +40,8 @@ from m5.SimObject import SimObject from m5.params import * from m5.proxy import * -from Device import PioDevice -from PciDevice import PciDevice +from m5.objects.Device import PioDevice +from m5.objects.PciDevice import PciDevice class VirtIODeviceBase(SimObject): diff --git a/src/dev/virtio/VirtIO9P.py b/src/dev/virtio/VirtIO9P.py index 623403d1d..02e50f301 100644 --- a/src/dev/virtio/VirtIO9P.py +++ b/src/dev/virtio/VirtIO9P.py @@ -39,7 +39,7 @@ from m5.params import * from m5.proxy import * -from VirtIO import VirtIODeviceBase +from m5.objects.VirtIO import VirtIODeviceBase class VirtIO9PBase(VirtIODeviceBase): type = 'VirtIO9PBase' diff --git a/src/dev/virtio/VirtIOBlock.py b/src/dev/virtio/VirtIOBlock.py index 1add847c7..5f68c00c2 100644 --- a/src/dev/virtio/VirtIOBlock.py +++ b/src/dev/virtio/VirtIOBlock.py @@ -39,7 +39,7 @@ from m5.params import * from m5.proxy import * -from VirtIO import VirtIODeviceBase +from m5.objects.VirtIO import VirtIODeviceBase class VirtIOBlock(VirtIODeviceBase): type = 'VirtIOBlock' diff --git a/src/dev/virtio/VirtIOConsole.py b/src/dev/virtio/VirtIOConsole.py index bce5e1de2..142bbc69e 100644 --- a/src/dev/virtio/VirtIOConsole.py +++ b/src/dev/virtio/VirtIOConsole.py @@ -39,8 +39,8 @@ from m5.params import * from m5.proxy import * -from VirtIO import VirtIODeviceBase -from Serial import SerialDevice +from m5.objects.VirtIO import VirtIODeviceBase +from m5.objects.Serial import SerialDevice class VirtIOConsole(VirtIODeviceBase): type = 'VirtIOConsole' |