diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-07-12 17:21:25 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-07-12 17:21:25 -0400 |
| commit | 6dfaf06edf53eb80af8d2a5b1722fb399cdb814d (patch) | |
| tree | 324b900cf01185923ef36d31b177fb1d97db5289 /src/python/m5/objects/DiskImage.py | |
| parent | bbfe1db6b3d96e5bbf8fe91a494cf60eceae68ad (diff) | |
| parent | 6f81ae5cade20f855831065e31355e11eb2b9182 (diff) | |
| download | gem5-6dfaf06edf53eb80af8d2a5b1722fb399cdb814d.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
configs/test/test.py:
Hand merge.
--HG--
extra : convert_revision : e3fce9cf50a65a9400cd3ec887b13e4765274ec2
Diffstat (limited to 'src/python/m5/objects/DiskImage.py')
| -rw-r--r-- | src/python/m5/objects/DiskImage.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/python/m5/objects/DiskImage.py b/src/python/m5/objects/DiskImage.py index 70d8b2e45..a98b35a4f 100644 --- a/src/python/m5/objects/DiskImage.py +++ b/src/python/m5/objects/DiskImage.py @@ -10,6 +10,6 @@ class RawDiskImage(DiskImage): class CowDiskImage(DiskImage): type = 'CowDiskImage' - child = Param.DiskImage("child image") + child = Param.DiskImage(RawDiskImage(read_only=True), + "child image") table_size = Param.Int(65536, "initial table size") - image_file = '' |