diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2012-01-31 22:40:08 -0800 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2012-01-31 22:40:08 -0800 |
commit | ea8b347dc5d375572d8d19770024ec8be5fd5017 (patch) | |
tree | 56bb75b1f071a749b7e90218d0d6b0e9265657bb /src/dev/disk_image.cc | |
parent | e88165a431a90cf7e33e205794caed898ca6fcb1 (diff) | |
parent | 7d4f18770073d968c70cd3ffcdd117f50a6056a2 (diff) | |
download | gem5-ea8b347dc5d375572d8d19770024ec8be5fd5017.tar.xz |
Merge with head, hopefully the last time for this batch.
Diffstat (limited to 'src/dev/disk_image.cc')
-rw-r--r-- | src/dev/disk_image.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dev/disk_image.cc b/src/dev/disk_image.cc index 4c770fbcd..c9defb605 100644 --- a/src/dev/disk_image.cc +++ b/src/dev/disk_image.cc @@ -170,12 +170,12 @@ CowDiskImage::CowDiskImage(const Params *p) : DiskImage(p), filename(p->image_file), child(p->child), table(NULL) { if (filename.empty()) { - init(p->table_size); + initSectorTable(p->table_size); } else { if (!open(filename)) { if (p->read_only) fatal("could not open read-only file"); - init(p->table_size); + initSectorTable(p->table_size); } if (!p->read_only) @@ -270,7 +270,7 @@ CowDiskImage::open(const string &file) } void -CowDiskImage::init(int hash_size) +CowDiskImage::initSectorTable(int hash_size) { table = new SectorTable(hash_size); |