diff options
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/m5/__init__.py | 3 | ||||
| -rw-r--r-- | src/python/m5/objects/Ethernet.py | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py index 03e0508fb..d41fd5a61 100644 --- a/src/python/m5/__init__.py +++ b/src/python/m5/__init__.py @@ -150,7 +150,6 @@ def changeToAtomic(system): doDrain(system) print "Changing memory mode to atomic" system.changeTiming(cc_main.SimObject.Atomic) - resume(system) def changeToTiming(system): if not isinstance(system, objects.Root) and not isinstance(system, objects.System): @@ -159,7 +158,6 @@ def changeToTiming(system): doDrain(system) print "Changing memory mode to timing" system.changeTiming(cc_main.SimObject.Timing) - resume(system) def switchCpus(cpuList): print "switching cpus" @@ -190,7 +188,6 @@ def switchCpus(cpuList): cc_main.cleanupCountedDrain(drain_event) # Now all of the CPUs are ready to be switched out for old_cpu in old_cpus: - print "switching" old_cpu._ccObject.switchOut() index = 0 for new_cpu in new_cpus: diff --git a/src/python/m5/objects/Ethernet.py b/src/python/m5/objects/Ethernet.py index f17a6c888..a52e35511 100644 --- a/src/python/m5/objects/Ethernet.py +++ b/src/python/m5/objects/Ethernet.py @@ -71,7 +71,7 @@ class IGbE(PciDevice): class IGbEPciData(PciConfigData): VendorID = 0x8086 - DeviceID = 0x1026 + DeviceID = 0x1075 SubsystemID = 0x1008 SubsystemVendorID = 0x8086 Status = 0x0000 |