From 54cc0053f0a6822e47a49771976af6daaabc24bb Mon Sep 17 00:00:00 2001 From: Miles Kaufmann Date: Thu, 30 Aug 2007 15:16:59 -0400 Subject: params: Deprecate old-style constructors; update most SimObject constructors. SimObjects not yet updated: - Process and subclasses - BaseCPU and subclasses The SimObject(const std::string &name) constructor was removed. Subclasses that still rely on that behavior must call the parent initializer as : SimObject(makeParams(name)) --HG-- extra : convert_revision : d6faddde76e7c3361ebdbd0a7b372a40941c12ed --- src/dev/disk_image.hh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/dev/disk_image.hh') diff --git a/src/dev/disk_image.hh b/src/dev/disk_image.hh index 45d5af649..3918209fc 100644 --- a/src/dev/disk_image.hh +++ b/src/dev/disk_image.hh @@ -39,6 +39,9 @@ #include "base/hashmap.hh" #include "sim/sim_object.hh" +#include "params/DiskImage.hh" +#include "params/CowDiskImage.hh" +#include "params/RawDiskImage.hh" #define SectorSize (512) @@ -51,7 +54,8 @@ class DiskImage : public SimObject bool initialized; public: - DiskImage(const std::string &name) : SimObject(name), initialized(false) {} + typedef DiskImageParams Params; + DiskImage(const Params *p) : SimObject(p), initialized(false) {} virtual ~DiskImage() {} virtual off_t size() const = 0; @@ -72,8 +76,8 @@ class RawDiskImage : public DiskImage mutable off_t disk_size; public: - RawDiskImage(const std::string &name, const std::string &filename, - bool rd_only); + typedef RawDiskImageParams Params; + RawDiskImage(const Params *p); ~RawDiskImage(); void close(); @@ -113,9 +117,8 @@ class CowDiskImage : public DiskImage SectorTable *table; public: - CowDiskImage(const std::string &name, DiskImage *kid, int hash_size); - CowDiskImage(const std::string &name, DiskImage *kid, int hash_size, - const std::string &filename, bool read_only); + typedef CowDiskImageParams Params; + CowDiskImage(const Params *p); ~CowDiskImage(); void init(int hash_size); -- cgit v1.2.3