Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor

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

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index 755d900..aab5e22 100644 (file)
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -46,17 +46,13 @@ typedef xbt_dictelm_t msg_host_t;
 typedef s_xbt_dictelm_t s_msg_host_t;
 
 typedef struct msg_host_priv {
-
-       // TODO Warning keeping such vms attribut may lead to some complexity at the SURF Level.
-       // Please check with Arnaud
-       xbt_dynar_t vms;
 #ifdef MSG_USE_DEPRECATED
   msg_mailbox_t *mailboxes;     /**< the channels  */
 #endif
 } s_msg_host_priv_t, *msg_host_priv_t;
 
 static inline msg_host_priv_t MSG_host_priv(msg_host_t host){
-  return xbt_lib_get_level(host, MSG_HOST_LEVEL);
+  return (msg_host_priv_t )xbt_lib_get_level(host, MSG_HOST_LEVEL);
 }
 
 
@@ -84,43 +80,14 @@ typedef struct msg_task {
  */
 typedef struct msg_task *msg_task_t;
 
-/* ******************************** Hypervisor ************************************* */
-typedef struct msg_hypervisor *msg_hypervisor_t;
-
-typedef struct msg_hypervisor {
-       const char *name;
-       s_xbt_swag_hookup_t all_hypervisor_hookup;
-       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.
- Ê **/
-       int overcommit;
-
-} s_msg_hypervisor_t;
-
-/* ********************************  VM ************************************* */
+/* ******************************** VM ************************************* */
 typedef msg_host_t msg_vm_t;
 typedef msg_host_priv_t msg_vm_priv_t;
 
-typedef enum {
-msg_vm_state_created,
-msg_vm_state_running,
-msg_vm_state_sleeping,
-msg_vm_state_migrating,
-msg_vm_state_resuming,
-msg_vm_state_suspended,
-msg_vm_state_saved,
-msg_vm_state_restoring,
-} e_msg_vm_state_t;
-
 static inline msg_vm_priv_t MSG_vm_priv(msg_vm_t vm){
   return xbt_lib_get_level(vm, MSG_HOST_LEVEL);
 }
 
-
 /* ******************************** File ************************************ */
 typedef struct simdata_file *simdata_file_t;