Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Fix conflict - Adrien
authoralebre <adrien.lebre@inria.fr>
Thu, 31 Jan 2013 20:57:05 +0000 (21:57 +0100)
committeralebre <adrien.lebre@inria.fr>
Thu, 31 Jan 2013 20:57:05 +0000 (21:57 +0100)
1  2 
src/surf/vm_workstation.c

@@@ -49,15 -49,16 +50,16 @@@ static void vm_ws_destroy(smx_host_t ho
        /* this will call surf_resource_free() */
        xbt_lib_unset(host_lib, name, SURF_WKS_LEVEL);
  
-       xbt_free(workstation);
+       xbt_free(vm_ws->generic_resource.name);
+       xbt_free(vm_ws);
  }
  
 -static int vm_ws_get_state(void *vm_ws){
 -      return ((workstation_VM2013_t)vm_ws)->current_state;
 +static int vm_ws_get_state(void *ind_vm_ws){
 +      return ((workstation_VM2013_t) surf_workstation_resource_priv(ind_vm_ws))->current_state;
  }
  
 -static void vm_ws_set_state(void *vm_ws, int state){
 -       ((workstation_VM2013_t)vm_ws)->current_state=state;
 +static void vm_ws_set_state(void *ind_vm_ws, int state){
 +       ((workstation_VM2013_t) surf_workstation_resource_priv(ind_vm_ws))->current_state=state;
  }
  static void surf_vm_workstation_model_init_internal(void)
  {