Merge branch 'master' into disk

[simgrid.git] / src / surf / sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 218cfb8..d172827 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -82,6 +82,8 @@ void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args)
   mount_list.clear();
 
   host->pimpl_->disks_ = std::move(args->disks);
+  for (auto d : host->pimpl_->disks_)
+    d->set_host(host);
 
   /* Change from the defaults */
   if (args->state_trace)
@@ -337,11 +339,11 @@ void sg_platf_new_cabinet(simgrid::kernel::routing::CabinetCreationArgs* cabinet
 simgrid::kernel::resource::DiskImpl* sg_platf_new_disk(simgrid::kernel::routing::DiskCreationArgs* disk)
 {
   simgrid::kernel::resource::DiskImpl* d = surf_disk_model->createDisk(disk->id, disk->read_bw, disk->write_bw);
-
   if (disk->properties) {
     d->set_properties(*disk->properties);
     delete disk->properties;
   }
+  simgrid::s4u::Disk::on_creation(*d->get_iface());
   return d;
 }