From 2e6c7a938ab63482d80a4e232683e41086d17ca6 Mon Sep 17 00:00:00 2001 From: alebre Date: Thu, 31 Jan 2013 19:11:29 +0100 Subject: [PATCH] minor stuff --- include/msg/datatypes.h | 2 +- src/simix/smx_vm.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h index 755d900632..dfb78b10bd 100644 --- a/include/msg/datatypes.h +++ b/include/msg/datatypes.h @@ -116,7 +116,7 @@ msg_vm_state_saved, msg_vm_state_restoring, } e_msg_vm_state_t; -static inline msg_vm_priv_t MSG_vm_priv(msg_vm_t vm){ +static inline msg_vm_priv_t field_of(msg_vm_t vm){ return xbt_lib_get_level(vm, MSG_HOST_LEVEL); } diff --git a/src/simix/smx_vm.c b/src/simix/smx_vm.c index 1041a7b941..a9fb795879 100644 --- a/src/simix/smx_vm.c +++ b/src/simix/smx_vm.c @@ -84,12 +84,11 @@ int SIMIX_pre_vm_state(smx_host_t vm){ * * \param h the host to destroy (a smx_host_t) */ -void SIMIX_vm_host_destroy(void *h) +void SIMIX_vm_host_destroy() { smx_host_priv_t host = (smx_host_priv_t) h; - smx_host_t - xbt_lib_(host_lib,name,SIMIX_HOST_LEVEL,smx_host); + vm_ws = xbt_lib_(host_lib,name,SURF_WKS_LEVEL,smx_host); /* jump to vm_ws_destroy() */ surf_vm_workstation_model->extension.vm_workstation.destroy(name); -- 2.20.1