tiny simplification

[simgrid.git] / src / surf / virtual_machine.hpp

diff --git a/src/surf/virtual_machine.hpp b/src/surf/virtual_machine.hpp
index 9cfdde0..c3991ba 100644 (file)
--- a/src/surf/virtual_machine.hpp
+++ b/src/surf/virtual_machine.hpp
@@ -56,38 +56,35 @@ extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> on
  */
 class VirtualMachine : public HostImpl {
 public:
-  VirtualMachine(simgrid::surf::HostModel *model, const char *name, simgrid::s4u::Host *host);
+  VirtualMachine(const char* name, simgrid::s4u::Host* host);
   ~VirtualMachine();
 
   /** @brief Suspend the VM */
-  virtual void suspend()=0;
+  virtual void suspend();
 
   /** @brief Resume the VM */
-  virtual void resume()=0;
+  virtual void resume();
 
   /** @brief Save the VM (Not yet implemented) */
-  virtual void save()=0;
+  virtual void save();
 
   /** @brief Restore the VM (Not yet implemented) */
-  virtual void restore()=0;
+  virtual void restore();
 
   /** @brief Migrate the VM to the destination host */
-  virtual void migrate(sg_host_t dest_PM)=0;
+  virtual void migrate(sg_host_t dest_PM);
 
   /** @brief Get the physical machine hosting the VM */
   sg_host_t getPm();
 
-  virtual void setBound(double bound)=0;
+  virtual void setBound(double bound);
 
   /* The vm object of the lower layer */
-  CpuAction *action_;
+  CpuAction *action_ = nullptr;
 protected:
   simgrid::s4u::Host *hostPM_;
 
 public:
-  void turnOn() override;
-  void turnOff() override;
-
   e_surf_vm_state_t getState();
   void setState(e_surf_vm_state_t state);
   static std::deque<VirtualMachine*> allVms_;
@@ -105,17 +102,18 @@ protected:
  */
 class VMModel : public HostModel {
 public:
-  VMModel() :HostModel(){}
-  ~VMModel(){};
-
   /**
    * @brief Create a new VM
    *
    * @param name The name of the new VM
    * @param host_PM The real machine hosting the VM
    */
-  virtual s4u::Host *createVM(const char *name, sg_host_t host_PM)=0;
-  void adjustWeightOfDummyCpuActions() {};
+  s4u::Host *createVM(const char *name, sg_host_t host_PM);
+  void adjustWeightOfDummyCpuActions() override {};
+
+  double nextOccuringEvent(double now) override;
+  void updateActionsState(double /*now*/, double /*delta*/) override {};
+
 };
 
 }