move content from MSG_VM to s4u::VM

[simgrid.git] / src / plugins / vm / s4u_VirtualMachine.cpp

diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp
index 13357ef..05d21f9 100644 (file)
--- a/src/plugins/vm/s4u_VirtualMachine.cpp
+++ b/src/plugins/vm/s4u_VirtualMachine.cpp
@@ -23,7 +23,7 @@ VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm) : Host(name)
 {
   XBT_DEBUG("Create VM %s", name);
 
-  pimpl_vm_ = new surf::VirtualMachineImpl(this, pm);
+  pimpl_vm_ = new vm::VirtualMachineImpl(this, pm);
   /* Currently, a VM uses the network resource of its physical host */
   pimpl_netcard = pm->pimpl_netcard;
   // Create a VCPU for this VM
@@ -37,7 +37,7 @@ VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm) : Host(name)
   extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
 
   if (TRACE_msg_vm_is_enabled()) {
-    container_t host_container = PJ_container_get(sg_host_get_name(pm));
+    container_t host_container = PJ_container_get(pm->cname());
     PJ_container_new(name, INSTR_MSG_VM, host_container);
   }
 }
@@ -46,7 +46,7 @@ VirtualMachine::~VirtualMachine()
 {
   onDestruction(*this);
 
-  XBT_DEBUG("destroy %s", name().c_str());
+  XBT_DEBUG("destroy %s", cname());
 
   /* FIXME: this is really strange that everything fails if the next line is removed.
    * This is as if we shared these data with the PM, which definitely should not be the case...
@@ -57,25 +57,32 @@ VirtualMachine::~VirtualMachine()
   extension_set<simgrid::simix::Host>(nullptr);
 
   /* Don't free these things twice: they are the ones of my physical host */
-  pimpl_cpu     = nullptr;
   pimpl_netcard = nullptr;
 }
 
 bool VirtualMachine::isMigrating()
 {
-  return static_cast<surf::VirtualMachineImpl*>(pimpl_)->isMigrating;
+  return pimpl_vm_->isMigrating;
+}
+double VirtualMachine::getRamsize()
+{
+  return pimpl_vm_->params_.ramsize;
+}
+simgrid::s4u::Host* VirtualMachine::pm()
+{
+  return pimpl_vm_->getPm();
 }
 
 /** @brief Retrieve a copy of the parameters of that VM/PM
  *  @details The ramsize and overcommit fields are used on the PM too */
 void VirtualMachine::parameters(vm_params_t params)
 {
-  static_cast<surf::VirtualMachineImpl*>(pimpl_)->getParams(params);
+  pimpl_vm_->getParams(params);
 }
 /** @brief Sets the params of that VM/PM */
 void VirtualMachine::setParameters(vm_params_t params)
 {
-  simgrid::simix::kernelImmediate([&]() { static_cast<surf::VirtualMachineImpl*>(pimpl_)->setParams(params); });
+  simgrid::simix::kernelImmediate([&]() { pimpl_vm_->setParams(params); });
 }
 
 } // namespace simgrid