31a32
> from Benchmarks import *
33d33
< from SysPaths import *
36,38d35
< script.dir = '/z/saidi/work/m5.newmem/configs/boot'
< linux_image = env.get('LINUX_IMAGE', disk('linux-latest.img'))
<
53c50
< def makeLinuxAlphaSystem(cpu, mem_mode, linux_image, icache=None, dcache=None, l2cache=None):
---
> def makeLinuxAlphaSystem(cpu, mem_mode, mdesc, icache=None, dcache=None, l2cache=None):
54a52
> self.readfile = mdesc.script()
58c56
< self.physmem = PhysicalMemory(range = AddrRange('128MB'))
---
> self.physmem = PhysicalMemory(range = AddrRange(mdesc.mem()))
64c62
< self.disk0.childImage(linux_image)
---
> self.disk0.childImage(mdesc.disk())
74c72
< self.simple_disk = SimpleDisk(disk=RawDiskImage(image_file = linux_image,
---
> self.simple_disk = SimpleDisk(disk=RawDiskImage(image_file = mdesc.disk(),
92c90
< def makeDualRoot(clientSystem, serverSystem):
---
> def makeDualRoot(testSystem, driveSystem):
94,95c92,93
< self.client = clientSystem
< self.server = serverSystem
---
> self.testsys = testSystem
> self.drivesys = driveSystem
98,99c96,97
< self.etherlink = EtherLink(int1 = Parent.client.tsunami.etherint[0],
< int2 = Parent.server.tsunami.etherint[0],
---
> self.etherlink = EtherLink(int1 = Parent.testsys.tsunami.etherint[0],
> int2 = Parent.drivesys.tsunami.etherint[0],