Merge with master and fix conflicts

[simgrid.git] / src / msg / msg_vm.c

diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c
index a6b5b99..908d89c 100644 (file)
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@ -94,7 +94,7 @@ const char *MSG_vm_get_name(msg_vm_t vm) {
 
 
 /* **** Check state of a VM **** */
-static inline int __MSG_vm_is_state(msg_vm_t vm, e_msg_vm_state_t state) {
+static inline int __MSG_vm_is_state(msg_vm_t vm, e_surf_vm_state_t state) {
   return simcall_vm_get_state(vm) == state;
 }
 
@@ -103,7 +103,7 @@ static inline int __MSG_vm_is_state(msg_vm_t vm, e_msg_vm_state_t state) {
  */
 int MSG_vm_is_created(msg_vm_t vm)
 {
-  return __MSG_vm_is_state(vm, msg_vm_state_created);
+  return __MSG_vm_is_state(vm, SURF_VM_STATE_CREATED);
 }
 
 /** @brief Returns whether the given VM is currently running
@@ -111,7 +111,7 @@ int MSG_vm_is_created(msg_vm_t vm)
  */
 int MSG_vm_is_running(msg_vm_t vm)
 {
-  return __MSG_vm_is_state(vm, msg_vm_state_running);
+  return __MSG_vm_is_state(vm, SURF_VM_STATE_RUNNING);
 }
 
 /** @brief Returns whether the given VM is currently migrating
@@ -119,7 +119,7 @@ int MSG_vm_is_running(msg_vm_t vm)
  */
 int MSG_vm_is_migrating(msg_vm_t vm)
 {
-  return __MSG_vm_is_state(vm, msg_vm_state_migrating);
+  return __MSG_vm_is_state(vm, SURF_VM_STATE_MIGRATING);
 }
 
 /** @brief Returns whether the given VM is currently suspended, not running.
@@ -127,7 +127,7 @@ int MSG_vm_is_migrating(msg_vm_t vm)
  */
 int MSG_vm_is_suspended(msg_vm_t vm)
 {
-  return __MSG_vm_is_state(vm, msg_vm_state_suspended);
+  return __MSG_vm_is_state(vm, SURF_VM_STATE_SUSPENDED);
 }
 
 /** @brief Returns whether the given VM is being saved (FIXME: live saving or not?).
@@ -135,7 +135,7 @@ int MSG_vm_is_suspended(msg_vm_t vm)
  */
 int MSG_vm_is_saving(msg_vm_t vm)
 {
-  return __MSG_vm_is_state(vm, msg_vm_state_saving);
+  return __MSG_vm_is_state(vm, SURF_VM_STATE_SAVING);
 }
 
 /** @brief Returns whether the given VM has been saved, not running.
@@ -143,7 +143,7 @@ int MSG_vm_is_saving(msg_vm_t vm)
  */
 int MSG_vm_is_saved(msg_vm_t vm)
 {
-  return __MSG_vm_is_state(vm, msg_vm_state_saved);
+  return __MSG_vm_is_state(vm, SURF_VM_STATE_SAVED);
 }
 
 /** @brief Returns whether the given VM is being restored, not running.
@@ -151,7 +151,7 @@ int MSG_vm_is_saved(msg_vm_t vm)
  */
 int MSG_vm_is_restoring(msg_vm_t vm)
 {
-  return __MSG_vm_is_state(vm, msg_vm_state_restoring);
+  return __MSG_vm_is_state(vm, SURF_VM_STATE_RESTORING);
 }
 
 
@@ -339,13 +339,11 @@ void MSG_vm_resume(msg_vm_t vm)
 void MSG_vm_save(msg_vm_t vm)
 {
   simcall_vm_save(vm);
-
   #ifdef HAVE_TRACING
   TRACE_msg_vm_save(vm);
   #endif
 }
 
-
 /** @brief Restore the execution of the VM. All processes on the VM run again.
  *  @ingroup msg_VMs
  *