A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
simix
/
smx_vm.c
diff --git
a/src/simix/smx_vm.c
b/src/simix/smx_vm.c
index
d6bb3ec
..
091e92a
100644
(file)
--- a/
src/simix/smx_vm.c
+++ b/
src/simix/smx_vm.c
@@
-96,7
+96,8
@@
static int __can_be_started(smx_host_t vm)
void SIMIX_vm_start(smx_host_t ind_vm)
{
if (__can_be_started(ind_vm))
void SIMIX_vm_start(smx_host_t ind_vm)
{
if (__can_be_started(ind_vm))
- surf_resource_set_state(surf_workstation_resource_priv(ind_vm), SURF_VM_STATE_RUNNING);
+ surf_resource_set_state(surf_workstation_resource_priv(ind_vm),
+ (int)SURF_VM_STATE_RUNNING);
else
THROWF(vm_error, 0, "The VM %s cannot be started", SIMIX_host_get_name(ind_vm));
}
else
THROWF(vm_error, 0, "The VM %s cannot be started", SIMIX_host_get_name(ind_vm));
}
@@
-357,7
+358,8
@@
void SIMIX_vm_shutdown(smx_host_t ind_vm, smx_process_t issuer)
}
/* FIXME: we may have to do something at the surf layer, e.g., vcpu action */
}
/* FIXME: we may have to do something at the surf layer, e.g., vcpu action */
- surf_resource_set_state(surf_workstation_resource_priv(ind_vm), SURF_VM_STATE_CREATED);
+ surf_resource_set_state(surf_workstation_resource_priv(ind_vm),
+ (int)SURF_VM_STATE_CREATED);
}
void SIMIX_pre_vm_shutdown(smx_simcall_t simcall, smx_host_t ind_vm)
}
void SIMIX_pre_vm_shutdown(smx_simcall_t simcall, smx_host_t ind_vm)