Merge branch 'master' of github.com:simgrid/simgrid into dev_7

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

diff --git a/src/plugins/vm/VmLiveMigration.cpp b/src/plugins/vm/VmLiveMigration.cpp
index aebcd31..87195a5 100644 (file)
--- a/src/plugins/vm/VmLiveMigration.cpp
+++ b/src/plugins/vm/VmLiveMigration.cpp
@@ -59,7 +59,7 @@ void MigrationRx::operator()()
     counter++;
 
     // start link
-    container_t msg = instr::Container::by_name(vm_->get_name());
+    auto* msg = instr::Container::by_name(vm_->get_name());
     instr::Container::get_root()->get_link("VM_LINK")->start_event(msg, "M", key);
 
     // destroy existing container of this vm
@@ -180,7 +180,7 @@ void MigrationTx::operator()()
       XBT_CRITICAL("bug");
   } catch (const Exception&) {
     // hostfailure (if you want to know whether this is the SRC or the DST check directly in send_migration_data code)
-    // Stop the dirty page tracking an return (there is no memory space to release)
+    // Stop the dirty page tracking and return (there is no memory space to release)
     sg_vm_stop_dirty_page_tracking(vm_);
     return;
   }
@@ -219,7 +219,7 @@ void MigrationTx::operator()()
       } catch (const Exception&) {
         // hostfailure (if you want to know whether this is the SRC or the DST check directly in send_migration_data
         // code)
-        // Stop the dirty page tracking an return (there is no memory space to release)
+        // Stop the dirty page tracking and return (there is no memory space to release)
         sg_vm_stop_dirty_page_tracking(vm_);
         return;
       }
@@ -262,7 +262,7 @@ void MigrationTx::operator()()
     sendMigrationData(remaining_size, 3, 0, mig_speed, -1);
   } catch (const Exception&) {
     // hostfailure (if you want to know whether this is the SRC or the DST check directly in send_migration_data code)
-    // Stop the dirty page tracking an return (there is no memory space to release)
+    // Stop the dirty page tracking and return (there is no memory space to release)
     vm_->resume();
     return;
   }