105c105
< test_sys = makeLinuxAlphaSystem(test_mem_mode, TestMemClass, bm[0])
---
> test_sys = makeLinuxAlphaSystem(test_mem_mode, bm[0])
107c107
< test_sys = makeLinuxMipsSystem(test_mem_mode, TestMemClass, bm[0])
---
> test_sys = makeLinuxMipsSystem(test_mem_mode, bm[0])
109c109
< test_sys = makeSparcSystem(test_mem_mode, TestMemClass, bm[0])
---
> test_sys = makeSparcSystem(test_mem_mode, bm[0])
111,112c111
< test_sys = makeLinuxX86System(test_mem_mode, TestMemClass,
< options.num_cpus, bm[0])
---
> test_sys = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0])
114,115c113,114
< test_sys = makeArmSystem(test_mem_mode, options.machine_type,
< TestMemClass, bm[0], options.dtb_filename,
---
> test_sys = makeArmSystem(test_mem_mode, options.machine_type, bm[0],
> options.dtb_filename,
166a166,172
> # Create the appropriate memory controllers and connect them to the
> # memory bus
> test_sys.mem_ctrls = [TestMemClass(range = r, conf_table_reported = True)
> for r in test_sys.mem_ranges]
> for i in xrange(len(test_sys.mem_ctrls)):
> test_sys.mem_ctrls[i].port = test_sys.membus.master
>
169c175
< drive_sys = makeLinuxAlphaSystem(drive_mem_mode, DriveMemClass, bm[1])
---
> drive_sys = makeLinuxAlphaSystem(drive_mem_mode, bm[1])
171c177
< drive_sys = makeLinuxMipsSystem(drive_mem_mode, DriveMemClass, bm[1])
---
> drive_sys = makeLinuxMipsSystem(drive_mem_mode, bm[1])
173c179
< drive_sys = makeSparcSystem(drive_mem_mode, DriveMemClass, bm[1])
---
> drive_sys = makeSparcSystem(drive_mem_mode, bm[1])
175c181
< drive_sys = makeX86System(drive_mem_mode, DriveMemClass, np, bm[1])
---
> drive_sys = makeX86System(drive_mem_mode, np, bm[1])
177,178c183
< drive_sys = makeArmSystem(drive_mem_mode, options.machine_type,
< DriveMemClass, bm[1])
---
> drive_sys = makeArmSystem(drive_mem_mode, options.machine_type, bm[1])
203a209,215
> # Create the appropriate memory controllers and connect them to the
> # memory bus
> drive_sys.mem_ctrls = [DriveMemClass(range = r, conf_table_reported = True)
> for r in drive_sys.mem_ranges]
> for i in xrange(len(drive_sys.mem_ctrls)):
> drive_sys.mem_ctrls[i].port = drive_sys.membus.master
>