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

diff --cc examples/msg/cloud/simple_vm.c
Simple merge

diff --cc src/msg/msg_private.h
Simple merge

diff --cc src/msg/msg_vm.c
index b0170f9,102e822..113b521
--- 1/src/msg/msg_vm.c
--- 2/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@@ -308,13 -308,8 +308,10 @@@ static inline char *get_mig_task_name(c
    return bprintf("__task_mig_stage%d:%s(%s-%s)", stage, vm_name, src_pm_name, dst_pm_name);
  }
  
 +static void launch_deferred_exec_process(msg_host_t host, double computation, double prio);
 +
  static int migration_rx_fun(int argc, char *argv[])
  {
-   const char *pr_name = MSG_process_get_name(MSG_process_self());
-   const char *host_name = MSG_host_get_name(MSG_host_self());
- 
    XBT_DEBUG("mig: rx_start");
  
    xbt_assert(argc == 4);

diff --cc src/simix/smx_process.c
Simple merge

diff --cc src/surf/vm_workstation.c
Simple merge