1 files changed, 31 insertions, 13 deletions
diff --git a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini
index ccaf4ac7e..014efe16e 100644
--- a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini
@@ -20,7 +20,7 @@ eventq_index=0
 init_param=0
 intel_mp_pointer=system.intel_mp_pointer
 intel_mp_table=system.intel_mp_table
-kernel=/usr/local/google/home/gabeblack/gem5/x86_system_files/binaries/x86_64-vmlinux-2.6.22.9
+kernel=/usr/local/google/home/gabeblack/gem5/dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9
 kernel_addr_check=true
 load_addr_mask=18446744073709551615
 load_offset=0
@@ -813,7 +813,7 @@ header_cycles=1
 use_default_range=false
 width=8
 default=system.pc.pciconfig.pio
-master=system.apicbridge.slave system.pc.south_bridge.cmos.pio system.pc.south_bridge.dma1.pio system.pc.south_bridge.ide.pio system.pc.south_bridge.ide.config system.pc.south_bridge.keyboard.pio system.pc.south_bridge.pic1.pio system.pc.south_bridge.pic2.pio system.pc.south_bridge.pit.pio system.pc.south_bridge.speaker.pio system.pc.south_bridge.io_apic.pio system.pc.i_dont_exist.pio system.pc.behind_pci.pio system.pc.com_1.pio system.pc.fake_com_2.pio system.pc.fake_com_3.pio system.pc.fake_com_4.pio system.pc.fake_floppy.pio system.iocache.cpu_side
+master=system.apicbridge.slave system.pc.south_bridge.cmos.pio system.pc.south_bridge.dma1.pio system.pc.south_bridge.ide.pio system.pc.south_bridge.ide.config system.pc.south_bridge.keyboard.pio system.pc.south_bridge.pic1.pio system.pc.south_bridge.pic2.pio system.pc.south_bridge.pit.pio system.pc.south_bridge.speaker.pio system.pc.south_bridge.io_apic.pio system.pc.i_dont_exist1.pio system.pc.i_dont_exist2.pio system.pc.behind_pci.pio system.pc.com_1.pio system.pc.fake_com_2.pio system.pc.fake_com_3.pio system.pc.fake_com_4.pio system.pc.fake_floppy.pio system.iocache.cpu_side
 slave=system.bridge.master system.pc.south_bridge.ide.dma system.pc.south_bridge.io_apic.int_master
 
 [system.iocache]
@@ -838,7 +838,7 @@ tags=system.iocache.tags
 tgts_per_mshr=12
 two_queue=false
 write_buffers=8
-cpu_side=system.iobus.master[18]
+cpu_side=system.iobus.master[19]
 mem_side=system.membus.slave[4]
 
 [system.iocache.tags]
@@ -885,7 +885,7 @@ pio=system.membus.default
 
 [system.pc]
 type=Pc
-children=behind_pci com_1 fake_com_2 fake_com_3 fake_com_4 fake_floppy i_dont_exist pciconfig south_bridge
+children=behind_pci com_1 fake_com_2 fake_com_3 fake_com_4 fake_floppy i_dont_exist1 i_dont_exist2 pciconfig south_bridge
 eventq_index=0
 intrctrl=system.intrctrl
 system=system
@@ -906,7 +906,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.master[12]
+pio=system.iobus.master[13]
 
 [system.pc.com_1]
 type=Uart8250
@@ -918,7 +918,7 @@ pio_latency=100000
 platform=system.pc
 system=system
 terminal=system.pc.com_1.terminal
-pio=system.iobus.master[13]
+pio=system.iobus.master[14]
 
 [system.pc.com_1.terminal]
 type=Terminal
@@ -944,7 +944,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.master[14]
+pio=system.iobus.master[15]
 
 [system.pc.fake_com_3]
 type=IsaFake
@@ -962,7 +962,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.master[15]
+pio=system.iobus.master[16]
 
 [system.pc.fake_com_4]
 type=IsaFake
@@ -980,7 +980,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.master[16]
+pio=system.iobus.master[17]
 
 [system.pc.fake_floppy]
 type=IsaFake
@@ -998,9 +998,9 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.master[17]
+pio=system.iobus.master[18]
 
-[system.pc.i_dont_exist]
+[system.pc.i_dont_exist1]
 type=IsaFake
 clk_domain=system.clk_domain
 eventq_index=0
@@ -1018,6 +1018,24 @@ update_data=false
 warn_access=
 pio=system.iobus.master[11]
 
+[system.pc.i_dont_exist2]
+type=IsaFake
+clk_domain=system.clk_domain
+eventq_index=0
+fake_mem=false
+pio_addr=9223372036854776045
+pio_latency=100000
+pio_size=1
+ret_bad_addr=false
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
+ret_data8=255
+system=system
+update_data=false
+warn_access=
+pio=system.iobus.master[12]
+
 [system.pc.pciconfig]
 type=PciConfigAll
 bus=0
@@ -1180,7 +1198,7 @@ table_size=65536
 [system.pc.south_bridge.ide.disks0.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/usr/local/google/home/gabeblack/gem5/x86_system_files/disks/linux-x86.img
+image_file=/usr/local/google/home/gabeblack/gem5/dist/m5/system/disks/linux-x86.img
 read_only=true
 
 [system.pc.south_bridge.ide.disks1]
@@ -1203,7 +1221,7 @@ table_size=65536
 [system.pc.south_bridge.ide.disks1.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/usr/local/google/home/gabeblack/gem5/x86_system_files/disks/linux-bigswap2.img
+image_file=/usr/local/google/home/gabeblack/gem5/dist/m5/system/disks/linux-bigswap2.img
 read_only=true
 
 [system.pc.south_bridge.int_lines0]