From: Takahiro Hirofuchi <t.hirofuchi+sg@aist.go.jp>
Date: Wed, 5 Jun 2013 21:45:03 +0000 (+0200)
Subject: Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor
X-Git-Tag: v3_11_beta~297^2^2~34
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/dd22867177c86db2e9d0b76852cb09e044b1c0c8

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

dd22867177c86db2e9d0b76852cb09e044b1c0c8
diff --cc src/msg/msg_vm.c
index b0170f9bc7,102e8222fe..113b52167f
--- a/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);