Merge branch 'master' into hypervisor

[simgrid.git] / include / msg / datatypes.h

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index dfb78b1..e5b3ea1 100644 (file)
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -93,10 +93,10 @@ typedef struct msg_hypervisor {
        xbt_dynar_t vms;   // vms on this hypervisor
        msg_host_t host;  // physical host of this hypervisor
 
-  /* The hypervisor object does not have parameters like the number of CPU
- Ê * cores and the size of memory. These parameters come from those of the
- Ê * physical host.
- Ê **/
+/* The hypervisor object does not have parameters like the number of CPU
+* cores and the size of memory. These parameters come from those of the
+* physical host.
+**/
        int overcommit;
 
 } s_msg_hypervisor_t;
@@ -116,7 +116,7 @@ msg_vm_state_saved,
 msg_vm_state_restoring,
 } e_msg_vm_state_t;
 
-static inline msg_vm_priv_t field_of(msg_vm_t vm){
+static inline msg_vm_priv_t MSG_vm_priv(msg_vm_t vm){
   return xbt_lib_get_level(vm, MSG_HOST_LEVEL);
 }