Fix warning by c-lang

diff --git a/examples/msg/cloud/masterslave_virtual_machines.c b/examples/msg/cloud/masterslave_virtual_machines.c
index e0d4374..34f10b3 100644 (file)
--- a/examples/msg/cloud/masterslave_virtual_machines.c
+++ b/examples/msg/cloud/masterslave_virtual_machines.c
@@ -60,7 +60,7 @@ int master_fun(int argc, char *argv[])
 
   /* Launch VMs and worker processes. One VM per PM, and one worker process per VM. */
 
-  XBT_INFO("Launch %ld VMs", workers_count);
+  XBT_INFO("Launch %d VMs", workers_count);
   for (i=0; i< workers_count; i++) {
     char *vm_name = bprintf("VM%02d", i);
     char *pr_name = bprintf("WRK%02d", i);

diff --git a/src/surf/vm_workstation.c b/src/surf/vm_workstation.c
index 445ea13..5afa9d1 100644 (file)
--- a/src/surf/vm_workstation.c
+++ b/src/surf/vm_workstation.c
@@ -143,7 +143,7 @@ static void vm_ws_migrate(void *ind_vm, void *ind_dst_pm)
      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");

diff --git a/src/surf/workstation_private.h b/src/surf/workstation_private.h
index 22866eb..f786f4f 100644 (file)
--- a/src/surf/workstation_private.h
+++ b/src/surf/workstation_private.h
@@ -30,6 +30,7 @@ surf_action_t ws_execute(void *workstation, double size);
 surf_action_t ws_action_sleep(void *workstation, double duration);
 void ws_action_suspend(surf_action_t action);
 void ws_action_resume(surf_action_t action);
+void ws_action_cancel(surf_action_t action);
 e_surf_resource_state_t ws_get_state(void *workstation);
 double ws_action_get_remains(surf_action_t action);