-void SIMIX_host_execution_destroy(smx_action_t action);
-void SIMIX_host_execution_cancel(smx_action_t action);
-double SIMIX_host_execution_get_remains(smx_action_t action);
-e_smx_state_t SIMIX_host_execution_get_state(smx_action_t action);
-void SIMIX_host_execution_set_priority(smx_action_t action, double priority);
-void SIMIX_pre_host_execution_wait(smx_simcall_t simcall, smx_action_t action);
-
-// pre prototypes
-smx_host_t SIMIX_pre_host_get_by_name(smx_simcall_t, const char*);
-const char* SIMIX_pre_host_self_get_name(smx_simcall_t);
-const char* SIMIX_pre_host_get_name(smx_simcall_t, smx_host_t);
-xbt_dict_t SIMIX_pre_host_get_properties(smx_simcall_t, smx_host_t);
-int SIMIX_pre_host_get_core(smx_simcall_t, smx_host_t);
-double SIMIX_pre_host_get_speed(smx_simcall_t, smx_host_t);
-double SIMIX_pre_host_get_available_speed(smx_simcall_t, smx_host_t);
-int SIMIX_pre_host_get_state(smx_simcall_t, smx_host_t);
-double SIMIX_pre_host_get_current_power_peak(smx_simcall_t, smx_host_t);
-double SIMIX_pre_host_get_power_peak_at(smx_simcall_t, smx_host_t host, int pstate_index);
-int SIMIX_pre_host_get_nb_pstates(smx_simcall_t, smx_host_t host);
-void SIMIX_pre_host_set_power_peak_at(smx_simcall_t, smx_host_t host, int pstate_index);
-double SIMIX_pre_host_get_consumed_energy(smx_simcall_t, smx_host_t);
-void* SIMIX_pre_host_self_get_data(smx_simcall_t);
-void* SIMIX_pre_host_get_data(smx_simcall_t, smx_host_t);
-void SIMIX_pre_host_set_data(smx_simcall_t, smx_host_t, void*);
-smx_action_t SIMIX_pre_host_execute(smx_simcall_t, const char*, smx_host_t, double, double);
-smx_action_t SIMIX_pre_host_parallel_execute(smx_simcall_t, const char*, int, smx_host_t*,
- double*, double*, double, double);
-void SIMIX_pre_host_execution_destroy(smx_simcall_t, smx_action_t);
-void SIMIX_pre_host_execution_cancel(smx_simcall_t, smx_action_t);
-double SIMIX_pre_host_execution_get_remains(smx_simcall_t, smx_action_t);
-e_smx_state_t SIMIX_pre_host_execution_get_state(smx_simcall_t, smx_action_t);
-void SIMIX_pre_host_execution_set_priority(smx_simcall_t, smx_action_t, double);
-
-void SIMIX_host_execution_suspend(smx_action_t action);
-void SIMIX_host_execution_resume(smx_action_t action);
-
-void SIMIX_post_host_execute(smx_action_t action);
-
-#ifdef HAVE_TRACING
-void SIMIX_pre_set_category(smx_simcall_t simcall, smx_action_t action,
- const char *category);
-void SIMIX_set_category(smx_action_t action, const char *category);
-#endif
+XBT_PRIVATE void SIMIX_execution_cancel(smx_synchro_t synchro);
+XBT_PRIVATE void SIMIX_execution_set_priority(smx_synchro_t synchro, double priority);
+XBT_PRIVATE void SIMIX_execution_set_bound(smx_synchro_t synchro, double bound);
+XBT_PRIVATE void SIMIX_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask);
+
+XBT_PRIVATE void SIMIX_execution_finish(simgrid::kernel::activity::Exec *exec);
+
+XBT_PRIVATE void SIMIX_set_category(smx_synchro_t synchro, const char *category);
+
+/* vm related stuff */
+XBT_PRIVATE sg_host_t SIMIX_vm_create(const char *name, sg_host_t ind_phys_host);
+
+XBT_PRIVATE void SIMIX_vm_destroy(sg_host_t ind_vm);
+// --
+XBT_PRIVATE void SIMIX_vm_resume(sg_host_t ind_vm, smx_process_t issuer);
+
+XBT_PRIVATE void SIMIX_vm_suspend(sg_host_t ind_vm, smx_process_t issuer);
+// --
+XBT_PRIVATE void SIMIX_vm_save(sg_host_t ind_vm, smx_process_t issuer);
+
+XBT_PRIVATE void SIMIX_vm_restore(sg_host_t ind_vm, smx_process_t issuer);
+// --
+XBT_PRIVATE void SIMIX_vm_start(sg_host_t ind_vm);
+
+XBT_PRIVATE void SIMIX_vm_shutdown(sg_host_t ind_vm, smx_process_t issuer);
+// --
+
+XBT_PRIVATE e_surf_vm_state_t SIMIX_vm_get_state(sg_host_t ind_vm);
+// --
+XBT_PRIVATE void SIMIX_vm_migrate(sg_host_t ind_vm, sg_host_t ind_dst_pm);
+
+XBT_PRIVATE void *SIMIX_vm_get_pm(sg_host_t ind_vm);
+
+XBT_PRIVATE void SIMIX_vm_set_bound(sg_host_t ind_vm, double bound);
+
+XBT_PRIVATE void SIMIX_vm_set_affinity(sg_host_t ind_vm, sg_host_t ind_pm, unsigned long mask);
+
+XBT_PRIVATE void SIMIX_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm);
+
+SG_END_DECL()