From: Takahiro Hirofuchi <t.hirofuchi+sg@aist.go.jp>
Date: Thu, 21 Feb 2013 14:10:11 +0000 (+0100)
Subject: Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor
X-Git-Tag: v3_11_beta~297^2^2~74
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4e78565ea6b354a0e6250a87b483f909665a0ac3?hp=8fb2632505c04b21d3db068b0ed9e722e4952160

Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor

sync again
---

diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 7beb6313a2..e52254c94b 100644
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -327,6 +327,9 @@ XBT_PUBLIC(int) simcall_vm_get_state(smx_host_t vm);
 XBT_PUBLIC(void) simcall_vm_start(smx_host_t vm);
 XBT_PUBLIC(void) simcall_vm_migrate(smx_host_t vm, smx_host_t dst_pm);
 XBT_PUBLIC(const char*) simcall_vm_get_phys_host(smx_host_t vm);
+XBT_PUBLIC(void) simcall_vm_resume(smx_host_t vm);
+XBT_PUBLIC(void) simcall_vm_save(smx_host_t vm);
+XBT_PUBLIC(void) simcall_vm_restore(smx_host_t vm);
 XBT_PUBLIC(void) simcall_vm_suspend(smx_host_t vm);
 XBT_PUBLIC(void) simcall_vm_destroy(smx_host_t vm);
 XBT_PUBLIC(void) simcall_vm_shutdown(smx_host_t vm);
diff --git a/src/msg/instr_msg_vm.c b/src/msg/instr_msg_vm.c
index f4437c7f4e..88761139c1 100644
--- a/src/msg/instr_msg_vm.c
+++ b/src/msg/instr_msg_vm.c
@@ -55,7 +55,7 @@ void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host, msg_host_t new_h
   }
 }
 
-void TRACE_msg_vm_create (const char *vm_name, msg_host_t host)
+void TRACE_msg_vm_create(const char *vm_name, msg_host_t host)
 {
   if (TRACE_msg_vm_is_enabled()){
     int len = INSTR_DEFAULT_STR_SIZE;
@@ -66,7 +66,7 @@ void TRACE_msg_vm_create (const char *vm_name, msg_host_t host)
   }
 }
 
-void TRACE_msg_vm_start (msg_vm_t vm)
+void TRACE_msg_vm_start(msg_vm_t vm)
 {
   if (TRACE_msg_vm_is_enabled()){
     int len = INSTR_DEFAULT_STR_SIZE;
diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index 1b60ff64d7..a83c36c687 100644
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -165,6 +165,7 @@ char *instr_vm_id(msg_vm_t vm, char *str, int len);
 char *instr_vm_id_2(const char *vm_name, char *str, int len);
 void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host,
                                    msg_host_t new_host);
+void TRACE_msg_vm_start(msg_vm_t vm);
 void TRACE_msg_vm_create(const char *vm_name, msg_host_t host);
 void TRACE_msg_vm_kill(msg_vm_t process);
 void TRACE_msg_vm_suspend(msg_vm_t vm);