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

diff --combined src/surf/vm_workstation.c
index 5afa9d1,e5996fe..ac7dcc7
--- 1/src/surf/vm_workstation.c
--- 2/src/surf/vm_workstation.c
+++ b/src/surf/vm_workstation.c
@@@ -143,7 -143,7 +143,7 @@@ static void vm_ws_migrate(void *ind_vm
       if (state != SURF_ACTION_DONE)
         XBT_CRITICAL("FIXME: may need a proper handling, %d", state);
       if (ws_vm2013->cpu_action->remains > 0)
 -       XBT_CRITICAL("FIXME: need copy the state(?), %d", ws_vm2013->cpu_action->remains);
 +       XBT_CRITICAL("FIXME: need copy the state(?), %f", ws_vm2013->cpu_action->remains);
  
       int ret = surf_cpu_model_pm->action_unref(ws_vm2013->cpu_action);
       xbt_assert(ret == 1, "Bug: some resource still remains");
@@@ -383,12 -383,13 +383,13 @@@ static double vm_ws_share_resources(sur
      workstation_VM2013_t ws_vm2013 = (workstation_VM2013_t) ws_clm03;
      {
        void *ind_sub_host = xbt_lib_get_elm_or_null(host_lib, ws_vm2013->sub_ws->generic_resource.name);
+ #if 0
        XBT_INFO("cost %f remains %f start %f finish %f", ws_vm2013->cpu_action->cost,
            ws_vm2013->cpu_action->remains,
            ws_vm2013->cpu_action->start,
            ws_vm2013->cpu_action->finish
            );
- 
+ #endif
  #if 0
        surf_cpu_model_pm->action_unref(ws_vm2013->cpu_action);
        /* FIXME: this means busy loop? */