From 535d2553faf8b078c43120ad0a0dd5dcf977837a Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 28 Aug 2016 18:33:06 +0200 Subject: [PATCH 1/1] one 'void*' less --- include/simgrid/simix.h | 2 +- src/msg/msg_vm.cpp | 2 +- src/simix/libsmx.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 9033727663..d1c103a933 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -263,7 +263,7 @@ XBT_PUBLIC(e_smx_state_t) simcall_execution_wait(smx_activity_t execution); /******************************* VM simcalls ********************************/ // Create the vm_workstation at the SURF level -XBT_PUBLIC(void*) simcall_vm_create(const char *name, sg_host_t host); +XBT_PUBLIC(sg_host_t) simcall_vm_create(const char *name, sg_host_t host); XBT_PUBLIC(int) simcall_vm_get_state(sg_host_t vm); XBT_PUBLIC(void) simcall_vm_start(sg_host_t vm); XBT_PUBLIC(void) simcall_vm_migrate(sg_host_t vm, sg_host_t dst_pm); diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp index 4f93f968e7..2198f6d593 100644 --- a/src/msg/msg_vm.cpp +++ b/src/msg/msg_vm.cpp @@ -205,7 +205,7 @@ msg_vm_t MSG_vm_create_core(msg_host_t ind_pm, const char *name) /* Note: ind_vm and vm_workstation point to the same elm object. */ /* Ask the SIMIX layer to create the surf vm resource */ - sg_host_t ind_vm_workstation = (sg_host_t) simcall_vm_create(name, ind_pm); + sg_host_t ind_vm_workstation = simcall_vm_create(name, ind_pm); msg_vm_t ind_vm = (msg_vm_t) __MSG_host_create(ind_vm_workstation); diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index c50995f4e2..261f22c774 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -189,7 +189,7 @@ e_smx_state_t simcall_execution_wait(smx_activity_t execution) * * \return The host object of the VM */ -void* simcall_vm_create(const char *name, sg_host_t phys_host) +sg_host_t simcall_vm_create(const char *name, sg_host_t phys_host) { return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_create, name, phys_host)); } -- 2.20.1