1 files changed, 31 insertions, 30 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 61d43af95..3cac96d35 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=/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9
+kernel=/work/gem5/dist/binaries/x86_64-vmlinux-2.6.22.9
 kernel_addr_check=true
 load_addr_mask=18446744073709551615
 load_offset=0
@@ -30,7 +30,7 @@ memories=system.physmem
 mmap_using_noreserve=false
 multi_thread=false
 num_work_ids=16
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5_2/tests/halt.sh
 smbios_table=system.smbios_table
 symbolfile=
 work_begin_ckpt_count=0
@@ -837,8 +837,8 @@ frontend_latency=2
 response_latency=2
 use_default_range=false
 width=16
-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_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
+default=system.pc.pci_host.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.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]
@@ -865,7 +865,7 @@ tags=system.iocache.tags
 tgts_per_mshr=12
 write_buffers=8
 writeback_clean=false
-cpu_side=system.iobus.master[19]
+cpu_side=system.iobus.master[18]
 mem_side=system.membus.slave[4]
 
 [system.iocache.tags]
@@ -915,7 +915,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_exist1 i_dont_exist2 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 pci_host south_bridge
 eventq_index=0
 intrctrl=system.intrctrl
 system=system
@@ -936,7 +936,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.master[13]
+pio=system.iobus.master[12]
 
 [system.pc.com_1]
 type=Uart8250
@@ -948,7 +948,7 @@ pio_latency=100000
 platform=system.pc
 system=system
 terminal=system.pc.com_1.terminal
-pio=system.iobus.master[14]
+pio=system.iobus.master[13]
 
 [system.pc.com_1.terminal]
 type=Terminal
@@ -974,7 +974,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.master[15]
+pio=system.iobus.master[14]
 
 [system.pc.fake_com_3]
 type=IsaFake
@@ -992,7 +992,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.master[16]
+pio=system.iobus.master[15]
 
 [system.pc.fake_com_4]
 type=IsaFake
@@ -1010,7 +1010,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.master[17]
+pio=system.iobus.master[16]
 
 [system.pc.fake_floppy]
 type=IsaFake
@@ -1028,7 +1028,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.master[18]
+pio=system.iobus.master[17]
 
 [system.pc.i_dont_exist1]
 type=IsaFake
@@ -1046,7 +1046,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.master[11]
+pio=system.iobus.master[10]
 
 [system.pc.i_dont_exist2]
 type=IsaFake
@@ -1064,17 +1064,19 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.master[12]
+pio=system.iobus.master[11]
 
-[system.pc.pciconfig]
-type=PciConfigAll
-bus=0
+[system.pc.pci_host]
+type=GenericPciHost
 clk_domain=system.clk_domain
+conf_base=13835058055282163712
+conf_device_bits=8
+conf_size=16777216
 eventq_index=0
-pio_addr=0
-pio_latency=30000
+pci_dma_base=0
+pci_mem_base=0
+pci_pio_base=9223372036854775808
 platform=system.pc
-size=16777216
 system=system
 pio=system.iobus.default
 
@@ -1197,14 +1199,13 @@ config_latency=20000
 ctrl_offset=0
 disks=system.pc.south_bridge.ide.disks0 system.pc.south_bridge.ide.disks1
 eventq_index=0
+host=system.pc.pci_host
 io_shift=0
 pci_bus=0
 pci_dev=4
 pci_func=0
 pio_latency=30000
-platform=system.pc
 system=system
-config=system.iobus.master[4]
 dma=system.iobus.slave[1]
 pio=system.iobus.master[3]
 
@@ -1228,7 +1229,7 @@ table_size=65536
 [system.pc.south_bridge.ide.disks0.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-x86.img
+image_file=/work/gem5/dist/disks/linux-x86.img
 read_only=true
 
 [system.pc.south_bridge.ide.disks1]
@@ -1251,7 +1252,7 @@ table_size=65536
 [system.pc.south_bridge.ide.disks1.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img
+image_file=/work/gem5/dist/disks/linux-bigswap2.img
 read_only=true
 
 [system.pc.south_bridge.int_lines0]
@@ -1356,7 +1357,7 @@ pio_addr=4273995776
 pio_latency=100000
 system=system
 int_master=system.iobus.slave[2]
-pio=system.iobus.master[10]
+pio=system.iobus.master[9]
 
 [system.pc.south_bridge.keyboard]
 type=I8042
@@ -1370,7 +1371,7 @@ mouse_int_pin=system.pc.south_bridge.keyboard.mouse_int_pin
 pio_addr=0
 pio_latency=100000
 system=system
-pio=system.iobus.master[5]
+pio=system.iobus.master[4]
 
 [system.pc.south_bridge.keyboard.keyboard_int_pin]
 type=X86IntSourcePin
@@ -1391,7 +1392,7 @@ pio_addr=9223372036854775840
 pio_latency=100000
 slave=system.pc.south_bridge.pic2
 system=system
-pio=system.iobus.master[6]
+pio=system.iobus.master[5]
 
 [system.pc.south_bridge.pic1.output]
 type=X86IntSourcePin
@@ -1408,7 +1409,7 @@ pio_addr=9223372036854775968
 pio_latency=100000
 slave=Null
 system=system
-pio=system.iobus.master[7]
+pio=system.iobus.master[6]
 
 [system.pc.south_bridge.pic2.output]
 type=X86IntSourcePin
@@ -1423,7 +1424,7 @@ int_pin=system.pc.south_bridge.pit.int_pin
 pio_addr=9223372036854775872
 pio_latency=100000
 system=system
-pio=system.iobus.master[8]
+pio=system.iobus.master[7]
 
 [system.pc.south_bridge.pit.int_pin]
 type=X86IntSourcePin
@@ -1437,7 +1438,7 @@ i8254=system.pc.south_bridge.pit
 pio_addr=9223372036854775905
 pio_latency=100000
 system=system
-pio=system.iobus.master[9]
+pio=system.iobus.master[8]
 
 [system.physmem]
 type=DRAMCtrl