From: alebre <adrien.lebre@inria.fr>
Date: Thu, 31 Jan 2013 18:03:11 +0000 (+0100)
Subject: Adrien Fix conflict
X-Git-Tag: v3_11_beta~297^2^2~122
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2c620172723596963b0971d9602cffbe8893e39b?hp=97fd3f6677d07c8893042c2644ada1d892f71730

Adrien Fix conflict
---

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index aeff6695a2..755d900632 100644
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -103,6 +103,7 @@ typedef struct msg_hypervisor {
 
 /* ********************************  VM ************************************* */
 typedef msg_host_t msg_vm_t;
+typedef msg_host_priv_t msg_vm_priv_t;
 
 typedef enum {
 msg_vm_state_created,
@@ -115,6 +116,9 @@ 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){
+  return xbt_lib_get_level(vm, MSG_HOST_LEVEL);
+}
 
 
 /* ******************************** File ************************************ */
diff --git a/src/msg/instr_msg_vm.c b/src/msg/instr_msg_vm.c
index 7b7e3e4d6f..588841f547 100644
--- a/src/msg/instr_msg_vm.c
+++ b/src/msg/instr_msg_vm.c
@@ -13,7 +13,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_vm, instr, "MSG VM");
 
 char *instr_vm_id (msg_vm_t vm, char *str, int len)
 {
-  return instr_vm_id_2 (vm->name, str, len);
+
+	return instr_vm_id_2 (vm->name, str, len);
 }
 
 char *instr_vm_id_2 (const char *vm_name, char *str, int len)
diff --git a/src/simix/smx_smurf_private.h b/src/simix/smx_smurf_private.h
index d309ff9ea2..39296dec2b 100644
--- a/src/simix/smx_smurf_private.h
+++ b/src/simix/smx_smurf_private.h
@@ -276,9 +276,8 @@ ACTION(SIMCALL_HOST_EXECUTION_SET_PRIORITY, host_execution_set_priority, WITH_AN
 ACTION(SIMCALL_HOST_EXECUTION_WAIT, host_execution_wait, WITHOUT_ANSWER, TINT(result), TSPEC(execution, smx_action_t)) sep \
 ACTION(SIMCALL_VM_CREATE, vm_create, WITH_ANSWER, TPTR(result), TSTRING(name), TSPEC(phys_host, smx_host_t)) sep \
 ACTION(SIMCALL_VM_START, vm_start, WITHOUT_ANSWER, TVOID(result), TSPEC(phys_host, smx_host_t)) sep \
-ACTION(SIMCALL_VM_SET_STATE, vm_set_state, WITHOUT_ANSWER, TVOID(result), TSPEC(vm, smx_host_t)) TINT(state) sep \
+ACTION(SIMCALL_VM_SET_STATE, vm_set_state, WITHOUT_ANSWER, TVOID(result), TSPEC(vm, smx_host_t), TINT(state)) sep \
 ACTION(SIMCALL_VM_GET_STATE, vm_get_state, WITH_ANSWER, TINT(result), TSPEC(vm, smx_host_t)) sep \
-ACTION(SIMCALL_VM_START, vm_start, WITHOUT_ANSWER, TVOID(result), TSPEC(vm, smx_host_t)) sep \
 ACTION(SIMCALL_VM_DESTROY, vm_destroy, WITHOUT_ANSWER, TVOID(result), TSPEC(vm, smx_host_t)) sep \
 ACTION(SIMCALL_PROCESS_CREATE, process_create, WITH_ANSWER, TVOID(result), TSPEC(process, smx_process_t*), TSTRING(name), TSPEC(code, xbt_main_func_t), TPTR(data), TSTRING(hostname), TDOUBLE(kill_time), TINT(argc), TSPEC(argv, char**), TSPEC(properties, xbt_dict_t), TINT(auto_restart)) sep \
 ACTION(SIMCALL_PROCESS_KILL, process_kill, WITH_ANSWER, TVOID(result), TSPEC(process, smx_process_t)) sep \