X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/26969afaffaeb90750646079072d0afa9725fb23..fd9d52c0c7a9c96221fff2013cdeef05b6e979e2:/src/surf/virtual_machine.cpp diff --git a/src/surf/virtual_machine.cpp b/src/surf/virtual_machine.cpp index e640cc373a..75017d8790 100644 --- a/src/surf/virtual_machine.cpp +++ b/src/surf/virtual_machine.cpp @@ -32,9 +32,9 @@ VMModel::vm_list_t VMModel::ws_vms; * Resource * ************/ -VirtualMachine::VirtualMachine(HostModel *model, const char *name, xbt_dict_t props, simgrid::s4u::Host *hostPM) -: HostImpl(model, name, props, NULL, NULL, NULL) -, p_hostPM(hostPM) +VirtualMachine::VirtualMachine(HostModel *model, const char *name, simgrid::s4u::Host *hostPM) +: HostImpl(model, name, NULL, NULL, NULL) +, hostPM_(hostPM) { VMModel::ws_vms.push_back(*this); simgrid::s4u::Host::by_name_or_create(name)->extension_set(this); @@ -48,7 +48,7 @@ VirtualMachine::~VirtualMachine() VMDestructedCallbacks(this); VMModel::ws_vms.erase(VMModel::vm_list_t::s_iterator_to(*this)); /* Free the cpu_action of the VM. */ - XBT_ATTRIB_UNUSED int ret = p_action->unref(); + XBT_ATTRIB_UNUSED int ret = action_->unref(); xbt_assert(ret == 1, "Bug: some resource still remains"); } @@ -74,7 +74,7 @@ void VirtualMachine::turnOff() { /** @brief returns the physical machine on which the VM is running **/ sg_host_t VirtualMachine::getPm() { - return p_hostPM; + return hostPM_; } }