From 3485c6e6a8dd0c46b18838dc42b150f8093d54a8 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 23 Dec 2015 01:21:26 +0100 Subject: [PATCH] cosmetics in VM13 - Mark as override some methods - Kill a method redefinition to the same content --- src/surf/vm_hl13.cpp | 9 --------- src/surf/vm_hl13.hpp | 12 +++++------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp index d31a30acc9..19d008dc94 100644 --- a/src/surf/vm_hl13.cpp +++ b/src/surf/vm_hl13.cpp @@ -329,15 +329,6 @@ void VMHL13::setAffinity(Cpu *cpu, unsigned long mask){ p_action->setAffinity(cpu, mask); } -/* - * A surf level object will be useless in the upper layer. Returning the - * dict_elm of the host. - **/ -sg_host_t VMHL13::getPm() -{ - return p_hostPM; -} - /* Adding a task to a VM updates the VCPU task on its physical machine. */ Action *VMHL13::execute(double size) { diff --git a/src/surf/vm_hl13.hpp b/src/surf/vm_hl13.hpp index ca0f38026a..2244a38ba3 100644 --- a/src/surf/vm_hl13.hpp +++ b/src/surf/vm_hl13.hpp @@ -53,19 +53,17 @@ public: VMHL13(VMModel *model, const char* name, xbt_dict_t props, sg_host_t host_PM); ~VMHL13(); - void suspend(); - void resume(); + void suspend() override; + void resume() override; - void save(); - void restore(); + void save() override; + void restore() override; - void migrate(sg_host_t ind_dst_pm); + void migrate(sg_host_t ind_dst_pm) override; e_surf_resource_state_t getState(); void setState(e_surf_resource_state_t state); - sg_host_t getPm(); // will be vm_ws_get_pm() - void setBound(double bound); void setAffinity(Cpu *cpu, unsigned long mask); -- 2.20.1