summaryrefslogtreecommitdiff
path: root/configs/common
diff options
context:
space:
mode:
authorBjoern A. Zeeb <baz21@cam.ac.uk>2016-05-19 15:19:35 -0500
committerBjoern A. Zeeb <baz21@cam.ac.uk>2016-05-19 15:19:35 -0500
commit7fc668fae90bbc9ae639c3413e9e1d41d7cd086b (patch)
tree8c0e8b90d32fdeb7939cc0740e18d073c5e22b58 /configs/common
parenta6b00c07f6ec9dd25c860bc89691e3873f7996c6 (diff)
downloadgem5-7fc668fae90bbc9ae639c3413e9e1d41d7cd086b.tar.xz
config, x86: Properly space pad the X86IntelMPBus Entry descriptions
According to the Intel Multi Processor Specification rev 1.4 (-006) (*), section 4.3.2 Bus Entries, Bus type strings are >>6-character ASCII (blank-filled) strings<<. This patch properly pads the entries with the missing spaces at the end. (*) http://www.intel.com/design/pentium/datashts/24201606.pdf Committed by Jason Lowe-Power <power.jg@gmail.com>
Diffstat (limited to 'configs/common')
-rw-r--r--configs/common/FSConfig.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index eea6b2ad0..0b47fbb4c 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -553,9 +553,9 @@ def makeX86System(mem_mode, numCPUs=1, mdesc=None, self=None, Ruby=False):
# In gem5 Pc::calcPciConfigAddr(), it required "assert(bus==0)",
# but linux kernel cannot config PCI device if it was not connected to PCI bus,
# so we fix PCI bus id to 0, and ISA bus id to 1.
- pci_bus = X86IntelMPBus(bus_id = 0, bus_type='PCI')
+ pci_bus = X86IntelMPBus(bus_id = 0, bus_type='PCI ')
base_entries.append(pci_bus)
- isa_bus = X86IntelMPBus(bus_id = 1, bus_type='ISA')
+ isa_bus = X86IntelMPBus(bus_id = 1, bus_type='ISA ')
base_entries.append(isa_bus)
connect_busses = X86IntelMPBusHierarchy(bus_id=1,
subtractive_decode=True, parent_bus=0)