Remove one of the many pimple: HostModel::p_cpuModel

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

diff --git a/src/surf/vm_interface.cpp b/src/surf/vm_interface.cpp
index c72689d..7d43b69 100644 (file)
--- a/src/surf/vm_interface.cpp
+++ b/src/surf/vm_interface.cpp
@@ -10,23 +10,21 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf,
                                 "Logging specific to the SURF VM module");
 
-VMModelPtr surf_vm_model = NULL;
+VMModel *surf_vm_model = NULL;
 
 /*************
  * Callbacks *
  *************/
 
-surf_callback(void, VMPtr) VMCreatedCallbacks;
-surf_callback(void, VMPtr) VMDestructedCallbacks;
-surf_callback(void, VMPtr) VMStateChangedCallbacks;
+surf_callback(void, VM*) VMCreatedCallbacks;
+surf_callback(void, VM*) VMDestructedCallbacks;
+surf_callback(void, VM*) VMStateChangedCallbacks;
 
 /*********
  * Model *
  *********/
 
-VMModel::VMModel() : HostModel("Virtual Machine") {
-  p_cpuModel = surf_cpu_model_vm;
-}
+VMModel::VMModel() : HostModel("Virtual Machine") {}
 
 VMModel::vm_list_t VMModel::ws_vms;
 
@@ -34,8 +32,8 @@ VMModel::vm_list_t VMModel::ws_vms;
  * Resource *
  ************/
 
-VM::VM(ModelPtr model, const char *name, xbt_dict_t props,
-                       RoutingEdgePtr netElm, CpuPtr cpu)
+VM::VM(Model *model, const char *name, xbt_dict_t props,
+                       RoutingEdge *netElm, Cpu *cpu)
 : Host(model, name, props, NULL, netElm, cpu)
 {
   VMModel::ws_vms.push_back(*this);