[surf] Triggers the destructed callbacks on the full object

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

diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp
index 208e24e..428c515 100644 (file)
--- a/src/surf/vm_hl13.cpp
+++ b/src/surf/vm_hl13.cpp
@@ -179,8 +179,7 @@ VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props,
    * from the VM name, we have to make sure that the system does not call the
    * free callback for the network resource object. The network resource object
    * is still used by the physical machine. */
-  sg_host_t sg_sub_ws = sg_host_by_name_or_create(sub_ws->getName());
-  p_netElm = new RoutingEdgeWrapper(sg_host_edge(sg_sub_ws));
+  p_netElm = new RoutingEdgeWrapper(sg_host_edge(host_PM));
   sg_host_t host = sg_host_by_name_or_create(name);
   sg_host_edge_set(host, p_netElm);
 
@@ -198,8 +197,7 @@ VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props,
       NULL,                       // host->power_trace,
       1,                          // host->core_amount,
       SURF_RESOURCE_ON,           // host->initial_state,
-      NULL,                       // host->state_trace,
-      NULL);                       // host->properties,
+      NULL);                      // host->state_trace,
   p_cpu->plug(host);
 
   /* We create cpu_action corresponding to a VM process on the host operating system. */
@@ -341,8 +339,7 @@ void VMHL13::setAffinity(Cpu *cpu, unsigned long mask){
  **/
 sg_host_t VMHL13::getPm()
 {
-  // TODO, store pointer to the PM?
-  return simgrid::Host::by_name_or_null(p_subWs->getName());
+  return p_subWs->getHost();
 }
 
 /* Adding a task to a VM updates the VCPU task on its physical machine. */