Merge branch 'master' into hypervisor

diff --combined include/msg/msg.h
index deec342,330ed56..daa3818
--- 1/include/msg/msg.h
--- 2/include/msg/msg.h
+++ b/include/msg/msg.h
@@@ -205,6 -205,9 +205,9 @@@ XBT_PUBLIC(msg_error_t) MSG_process_sle
  XBT_PUBLIC(double) MSG_task_get_compute_duration(msg_task_t task);
  XBT_PUBLIC(void) MSG_task_set_compute_duration(msg_task_t task,
                                                 double compute_duration);
+ XBT_PUBLIC(void) MSG_task_set_data_size(msg_task_t task,
+                                              double data_size);
+ 
  XBT_PUBLIC(double) MSG_task_get_remaining_computation(msg_task_t task);
  XBT_PUBLIC(double) MSG_task_get_remaining_communication(msg_task_t task);
  XBT_PUBLIC(int) MSG_task_is_latency_bounded(msg_task_t task);
@@@ -338,12 -341,7 +341,12 @@@ XBT_PUBLIC(int) MSG_get_channel_number(
   *
   */
  /* This function should not be called directly, but rather from MSG_vm_start_from_template that does not exist yet*/
 -XBT_PUBLIC(msg_vm_t) MSG_vm_start(msg_host_t location, const char *name, int coreAmount);
 +
 +// TODO add VDI later
 +XBT_PUBLIC(msg_vm_t) MSG_vm_create(msg_host_t location, const char *name,
 +                                     int core_nb, int mem_cap, int net_cap);
 +
 +XBT_PUBLIC(void) MSG_vm_start(msg_vm_t);
  
  XBT_PUBLIC(int) MSG_vm_is_suspended(msg_vm_t);
  XBT_PUBLIC(int) MSG_vm_is_running(msg_vm_t);