From: Samuel Lepetit <samuel.lepetit@inria.fr>
Date: Wed, 30 May 2012 10:30:41 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_8~654^2~19
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/059ffba3002aa86e17392c7f2c884095ab64591b?hp=b745e5b5a5f85947c7e08266c6dbdbbf9f563918

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

diff --git a/.gitignore b/.gitignore
index ee1d9abc95..8edd0e3a78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,6 +135,7 @@ examples/msg/masterslave/toto.txt
 examples/msg/simulation.trace
 examples/msg/toto.txt
 examples/msg/z_gtnets.trace
+examples/msg/cloud/masterslave_virtual_machines
 examples/msg/tracing/link_srcdst_user_variables
 examples/msg/tracing/link_user_variables
 examples/msg/tracing/simple
diff --git a/COPYING b/COPYING
index 54dd23d24a..01cdd3741b 100644
--- a/COPYING
+++ b/COPYING
@@ -138,8 +138,8 @@ Their copyright is the following:
  *
  *      You should have received a copy of the GNU Lesser General Public
  *      License along with SimGrid in the file LICENSE-LGPL-2.1;
- *      if not, write to the Free Software Foundation, Inc.,
- *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *      if not, write to the Free Software Foundation, Inc., 
+ *      51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
  
 =========================================================================
diff --git a/ChangeLog b/ChangeLog
index a9fd34a159..b40ea021fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 SimGrid (3.8) NOT RELEASED; urgency=low
 
+ The "SimGrid makes psssshiiiit and jumps into the cloud" release.
+ 
+ CMAKE:
+ * Remove option custom_flags. Now use environment variables CFLAGS 
+   and LDFLAGS.
+  
+ MSG:
+ * Add an experimental interface to manipulate VMs. They are mainly
+   process groups with very few intrinsic semantic, but they should
+   allow you to build the semantic you want easily.
+
  SimDag:
  * New type of typed tasks SD_TASK_COMP_PAR_AMDAHL that represents a
    parallel task whose initial work is distributed among host according
@@ -17,6 +28,11 @@ SimGrid (3.8) NOT RELEASED; urgency=low
 
 SimGrid (3.7.1) NOT RELEASED; urgency=low
 
+ MSG:
+ * Restore the prototype of MSG_process_create_with_environment() to
+   the pre-3.7 situation by removing the kill_time argument.
+ * Add a MSG_process_set_kill_time() function instead.
+
  SURF:
  * Fix weird behaviors when dealing with parallel tasks.
 
@@ -1198,7 +1214,7 @@ SimGrid (3.3) stable; urgency=high
     [contributed by Sékou Diakite, many thanks]
 
  GRAS:
-  * Introduce a listener thread in charge of receiving incomming
+  * Introduce a listener thread in charge of receiving incoming
     messages from the network. It allows to overlap communication and
     computation but most notably, it removes some stupid deadlocks due
     to the fact that so far, a process could not send and receive at
diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 6c038b21b3..be472c756c 100644
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -146,6 +146,8 @@ ADD_TEST(msg-masterslave-failure-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TE
 ADD_TEST(msg-masterslave-mailbox-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh)
 ADD_TEST(msg-masterslave-cpu-ti-thread         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/masterslave    --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti_crosstraffic.tesh)
 
+ADD_TEST(msg-masterslave-virtual-machines ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/masterslave_virtual_machines.tesh)
+
 if(HAVE_UCONTEXT_H)
 	ADD_TEST(msg-sendrecv-CLM03-ucontext	${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}	--cfg contexts/factory:ucontext		--setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg 	--cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_CLM03.tesh)
 	ADD_TEST(msg-sendrecv-Vegas-ucontext	${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}	--cfg contexts/factory:ucontext		--setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg 	--cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Vegas.tesh)
diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 5dde708eeb..ef6012d616 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -282,6 +282,7 @@ set(MSG_SRC
 	src/msg/msg_deployment.c
 	src/msg/msg_mailbox.c
 	src/msg/msg_actions.c
+	src/msg/msg_vm.c
 )
 
 set(SIMDAG_SRC
diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index 6b5483391d..a17b01581e 100644
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -42,7 +42,6 @@ endif(enable_msg_deprecated)
 
 set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}")
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${custom_flags}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}")
 
 # Try to make Mac a bit more complient to open source standards
diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake
index eac15c9f35..b3f1413664 100644
--- a/buildtools/Cmake/MakeExe.cmake
+++ b/buildtools/Cmake/MakeExe.cmake
@@ -60,6 +60,7 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/pmm)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/start_kill_time)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/io)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/cloud)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gpu)
 
diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 6e64b98a02..3e180e389e 100644
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -4,7 +4,6 @@
 set(BIBTEX2HTML ${BIBTEX2HTML} CACHE PATH "Path to bibtex2html")
 set(gtnets_path ${gtnets_path} CACHE PATH "Path to gtnets lib and include")
 set(ns3_path ${ns3_path} CACHE PATH "Path to ns3 lib and include")
-set(custom_flags ${custom_flags} CACHE FORCE "Customers flags add to cmake_c_flag")
 
 if(NOT CMAKE_INSTALL_PREFIX)
 	set(CMAKE_INSTALL_PREFIX "/usr/local/simgrid/" CACHE PATH "Path where to install project")
@@ -73,3 +72,4 @@ mark_as_advanced(CMAKE_OSX_DEPLOYMENT_TARGET)
 mark_as_advanced(CMAKE_OSX_SYSROOT)                                                                         
 mark_as_advanced(SED_EXE)
 mark_as_advanced(BIBTEX2HTML)
+mark_as_advanced(CMAKE_C_LINK_FLAGS)
diff --git a/buildtools/Cmake/Pipol.cmake b/buildtools/Cmake/Pipol.cmake
index b01c5748d8..75b4e9ceae 100644
--- a/buildtools/Cmake/Pipol.cmake
+++ b/buildtools/Cmake/Pipol.cmake
@@ -8,10 +8,6 @@ IF(pipol_user)
 
 	set(CMAKE_OPTIONS "	-Wno-dev")
 	
-	if(custom_flags)
-	set(CMAKE_OPTIONS "${CMAKE_OPTIONS}	-Dcustom_flags=${custom_flags}")
-	endif(custom_flags)
-	
 	if(with_context)
 	set(CMAKE_OPTIONS "${CMAKE_OPTIONS}	-Dwith_context=${with_context}")
 	endif(with_context)
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index f36aa29736..bd4d33327a 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -781,7 +781,7 @@ EXAMPLE_PATH           = ./ \
 EXAMPLE_PATTERNS       =
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
+# searched for input files to be used with the \include or \don'tinclude
 # commands irrespective of the value of the RECURSIVE tag.
 # Possible values are YES and NO. If left blank NO is used.
 
diff --git a/doc/bindings.doc b/doc/bindings.doc
index 5c25bf98a4..a3265323e0 100644
--- a/doc/bindings.doc
+++ b/doc/bindings.doc
@@ -32,7 +32,7 @@ Actually, the use of lua in Simgrid is quite simple, you have just to follow the
   - loading the platforme/deployment XML file that describe the environment of simulation
   - and … Running the Simulation.
   
-\dontinclude lua/masterslave/master.lua
+\don'tinclude lua/masterslave/master.lua
 \subsection bindings_binding_lua_example_master_slave Master/Slave Example
 
  \li Master Code
@@ -41,13 +41,13 @@ we mainly  use   simgrid.Task.new(task_name,computation_size,communication_size)
 	 then simgrid.Task.send(task,alias) to send it.
 we use also simgrid.Task.name(task), to get the task's name. 
 
-\dontinclude lua/masterslave/slave.lua
+\don'tinclude lua/masterslave/slave.lua
 \li Slave Code
 \until end_of_slave
 Here, we see the use of simgrid.Task.recv(alias) to receive a task with a specific alias,
 this function return directly the task recevied.
 
-\dontinclude lua/masterslave/master_slave.lua
+\don'tinclude lua/masterslave/master_slave.lua
 \li Set Environmenet and run application
 \until simgrid.clean()
 
diff --git a/doc/gtut-introduction.doc b/doc/gtut-introduction.doc
index 71720918a6..01afc6bdbb 100644
--- a/doc/gtut-introduction.doc
+++ b/doc/gtut-introduction.doc
@@ -209,7 +209,7 @@ Two main types of events may change the internal state of a given process:
    messages during the transition associated to this event.\n
    \n
    Incoming messages are not handled as soon as they arrive, but only when
-   the process declares to be ready to accept incomming events (using \ref
+   the process declares to be ready to accept incoming events (using \ref
    gras_msg_handle or related functions). It ensures that the treatment of a
    given message won't run in parallel to any other callback, so that
    process globals (its state) can be accessed and modified without
@@ -221,7 +221,7 @@ Two main types of events may change the internal state of a given process:
    \n
    Processes can also wait explicitely for incoming messages matching some
    given criterions (using \ref gras_msg_wait). Any messages received before the
-   one matching the criterions will be added to the incomming messages'
+   one matching the criterions will be added to the incoming messages'
    queue for further use. This may breaks the message delivery order.
    Moreover, there is no restriction on when this can be done. So, a
    callback to a given message can consume messages of other types. There is
@@ -287,14 +287,14 @@ The experimental scenario is as follows: <ul>
 
 <li>Process A sends a first message (depicted in red) with gras_msg_send(), do
     some more computation, and then send another message (depicted in
-    yellow). Then, this process handles any incomming message with
+    yellow). Then, this process handles any incoming message with
     gras_msg_handle(). Since no message is already queued in process A at this
     point, this is a blocking call until the third message (depicted in
     magenta) arrives from the other process.</li>
 
 <li>On its side, the process B explicitely wait for the second message with
     gras_msg_wait(), do some computation with it, and then call
-    gras_msg_handle() to handle any incomming message. This will pop the red
+    gras_msg_handle() to handle any incoming message. This will pop the red
     message from the queue, and start the callback attached to that kind of
     messages. This callback sends back a new message (depicted in magenta) back
     to process A.</li>
@@ -331,7 +331,7 @@ network. The order of unexpected messages and subsequent ones is thus preserved
 from the receiver point of view.</li>
 
 <li>gras_msg_wait() and gras_msg_handle() accept timeouts as argument to
-specify how long you are willing to wait at most for incomming messages. These
+specify how long you are willing to wait at most for incoming messages. These
 were ignored here to not complexify the example any further. It is worth
 mentionning that the send operation cannot be timeouted. The existance of the
 listener should make it useless.</li>
@@ -341,7 +341,7 @@ listener should make it useless.</li>
 \subsection GRAS_tut_intro_model_timing_policy Timing policy
 
 All communication primitives allow 3 timout policies: one can only poll for
-incomming events (using timeout=0), wait endlessly for the communication to
+incoming events (using timeout=0), wait endlessly for the communication to
 be performed (using timeout<0) or specify a maximal delay to wait for the
 communication to proceed (using timeout>0, being a number of seconds).
 
diff --git a/doc/gtut-tour-02-simple.doc b/doc/gtut-tour-02-simple.doc
index bb5980d056..1bc4dfe68a 100644
--- a/doc/gtut-tour-02-simple.doc
+++ b/doc/gtut-tour-02-simple.doc
@@ -22,7 +22,7 @@ Fortunately, such discrepency will be detected in SG.
 
 We won't convey any payload in this lesson, so we just have to give the name
 of message to declare them:
-\dontinclude 02-simple.c
+\don'tinclude 02-simple.c
 \skip gras_msgtype_declare
 \until gras_msgtype_declare
 
@@ -65,7 +65,7 @@ messages, you have to create a so-called <i>client socket</i>. For this, use
 \ref gras_socket_client with the hostname and the port of the process you
 want to contact as arguments. Our client should simply do:
 
-\dontinclude 02-simple.c
+\don'tinclude 02-simple.c
 \skip socket_client
 \until socket_client
 
@@ -84,7 +84,7 @@ gras_msg_send on the sender side, and \ref gras_msg_wait on the receiver side.
 message, the message type (described by its name), and a pointer to the actual content of the
 message. Since we don't have any payload, this becomes:
 
-\dontinclude 02-simple.c
+\don'tinclude 02-simple.c
 \skip msg_send
 \until msg_send
 
@@ -96,7 +96,7 @@ message you received while the last argument is where to put the payload.
 
 Since our server is willing to wait up to 60 seconds for a message, the
 following will do it:
-\dontinclude 02-simple.c
+\don'tinclude 02-simple.c
 \skip msg_wait
 \until msg_wait
 
diff --git a/doc/gtut-tour-03-args.doc b/doc/gtut-tour-03-args.doc
index 33042c2ead..a8ed6c5136 100644
--- a/doc/gtut-tour-03-args.doc
+++ b/doc/gtut-tour-03-args.doc
@@ -19,7 +19,7 @@ situation.
 In RL, the situation is quite simple: we just have to use the command line
 arguments as we would do in a usual C program. In the server, only change
 concern the opennong of the master socket:
-\dontinclude 03-args.c
+\don'tinclude 03-args.c
 \skip gras_socket_server
 \until gras_socket_server
 
diff --git a/doc/gtut-tour-04-callback.doc b/doc/gtut-tour-04-callback.doc
index b23d808aeb..5ece1408d3 100644
--- a/doc/gtut-tour-04-callback.doc
+++ b/doc/gtut-tour-04-callback.doc
@@ -26,7 +26,7 @@ speaking about the message we are handling while the second is the payload.
 The callback returns an integer being its error code, just like the "main()"
 function. Here is the actual code of our callback:
 
-\dontinclude 04-callback.c
+\don'tinclude 04-callback.c
 \skip gras_msg_cb_ctx_t 
 \until end_of_callback
 
diff --git a/doc/gtut-tour-05-globals.doc b/doc/gtut-tour-05-globals.doc
index 11ddb12138..32450ce17f 100644
--- a/doc/gtut-tour-05-globals.doc
+++ b/doc/gtut-tour-05-globals.doc
@@ -28,7 +28,7 @@ it with the gras_userdata_* functions (there is only 3 of them ;).
 We will now modify the example to add a "kill" message, and let the server
 loop on incoming messages until it gets such a message. We only need a
 boolean, so the structure is quite simple: 
-\dontinclude 05-globals.c
+\don'tinclude 05-globals.c
 \skip struct
 \until server_data
  
@@ -38,7 +38,7 @@ helper macro mallocing the space needed by the structure and passing it to
 gras using the latter function. If you go for gras_userdata_set(), you
 should pass it a pointer to your data you want to retrieve afterward.
 
-\dontinclude 05-globals.c
+\don'tinclude 05-globals.c
 \skip userdata_new
 \until userdata_new
 
@@ -49,13 +49,13 @@ defined as being of type server_data_t*.
 
 Once you declared a global that way, retriving this (for example in a
 callback) is really easy:
-\dontinclude 05-globals.c
+\don'tinclude 05-globals.c
 \skip userdata_get
 \until userdata_get
 
 We can now write the callback, which simply retrive the globals and change
 the value of the <tt>kileld</tt> field.
-\dontinclude 05-globals.c
+\don'tinclude 05-globals.c
 \skip kill_cb
 \until end_of_kill_callback
 
diff --git a/doc/gtut-tour-06-logs.doc b/doc/gtut-tour-06-logs.doc
index 347abdb5c6..7055dd775f 100644
--- a/doc/gtut-tour-06-logs.doc
+++ b/doc/gtut-tour-06-logs.doc
@@ -74,7 +74,7 @@ of channel we want:
 What we want here is a root category (it does not belong to any existing
 channel, for sure), and we want it to be the default one in our file (of
 course, it's the only one).
-\dontinclude 06-logs.c
+\don'tinclude 06-logs.c
 \skip XBT_LOG
 \until XBT_LOG
 
diff --git a/doc/gtut-tour-07-timers.doc b/doc/gtut-tour-07-timers.doc
index e8fdcb9067..d584f261c1 100644
--- a/doc/gtut-tour-07-timers.doc
+++ b/doc/gtut-tour-07-timers.doc
@@ -36,7 +36,7 @@ must be function without argument nor result (<tt>void my_action(void){
 
 It is important to note that timers are not prehemptive. They will not start
 as soon as they are ready. Instead, they get served when you go into
-gras_msg_handle() (and they are served before incomming messages). This is
+gras_msg_handle() (and they are served before incoming messages). This is
 because allowing timers to run in parallel to the callbacks would add
 parallelism to the user code, which would have to protect data with mutexes.
 This is a level of complexity I really don't want for user code. If you
@@ -52,7 +52,7 @@ first need to add a global to the server too, containing the socket binded
 onto the server (to send messages) and a boolean indicating whether we are
 done or not, just like we did on the server side in \ref
 GRAS_tut_tour_globals. Here is the resulting global structure:
-\dontinclude 07-timers.c
+\don'tinclude 07-timers.c
 \skip client_data
 \until client_data_t
 
@@ -71,7 +71,7 @@ Desinstalling this is not harder. You tell the action to unschedule, and the
 periodicity at which it was desinstalled (so that the same action can be
 scheduled at different intervals, and each of them be desinstallable
 separately).
-\dontinclude 07-timers.c
+\don'tinclude 07-timers.c
 \skip gras_timer_cancel_repeat
 \until gras_timer_cancel_repeat
 
@@ -79,7 +79,7 @@ Then comes the delayed action in charge of stopping everything, which should
 be self-explanatory at this point. It could be cancelled before its
 expiration using gras_timer_cancel_delay(), which accepts exactly the same
 kind of arguments than gras_timer_cancel_repeat().
-\dontinclude 07-timers.c
+\don'tinclude 07-timers.c
 \skip client_do_stop
 \until end_of_client_do_stop
 
diff --git a/doc/gtut-tour-08-exceptions.doc b/doc/gtut-tour-08-exceptions.doc
index b9c7e36da3..a91771d12f 100644
--- a/doc/gtut-tour-08-exceptions.doc
+++ b/doc/gtut-tour-08-exceptions.doc
@@ -109,7 +109,7 @@ have to find from itself. For this, it will try to open socket and send the
 kill message to each ports of the search range. If it manage to close the
 socket after sending the message without being interrupted by an exception,
 it can assume that it killed the server and stop searching.
-\dontinclude 08-exceptions.c
+\don'tinclude 08-exceptions.c
 \skip port=3000
 \until end_of_loop
 
@@ -117,7 +117,7 @@ To make the game a bit more fun (and to show you what an exception actually
 look like when it's not catched), we add a potential command line argument
 to the server, asking it to cheat and to not open its port within the search
 range but elsewhere:
-\dontinclude 08-exceptions.c
+\don'tinclude 08-exceptions.c
 \skip strcmp
 \until gras_socket_my_port
 \until }
diff --git a/doc/gtut-tour-09-simpledata.doc b/doc/gtut-tour-09-simpledata.doc
index 0b1d2e4c42..21377c0c15 100644
--- a/doc/gtut-tour-09-simpledata.doc
+++ b/doc/gtut-tour-09-simpledata.doc
@@ -204,7 +204,7 @@ differ from node types to node types (the server attach 2 callbacks where
 the client don't attach any). Here is the message declaring function in our
 case:
 
-\dontinclude 09-simpledata.c
+\don'tinclude 09-simpledata.c
 \skip message_declaration(void)
 \until }
 
@@ -235,7 +235,7 @@ So, it you want to retrieve a double, you have to cast the pointer using
 <tt>(double*)</tt>, and then dereference the obtained pointer by adding a
 star before the cast. This is what we do here:
 
-\dontinclude 09-simpledata.c
+\don'tinclude 09-simpledata.c
 \skip server_kill_cb
 \until delay
 
diff --git a/doc/gtut-tour-10-rpc.doc b/doc/gtut-tour-10-rpc.doc
index e06f20ec0d..6591c0fe74 100644
--- a/doc/gtut-tour-10-rpc.doc
+++ b/doc/gtut-tour-10-rpc.doc
@@ -44,7 +44,7 @@ message. In our example, we accept one string in input, and a long in
 output for the a2i conversion (a=char 2=to i=integer), and the contrary in
 the other direction.
 
-\dontinclude 10-rpc.c
+\don'tinclude 10-rpc.c
 \skip gras_msgtype_declare_rpc
 \until long
 \until string
diff --git a/doc/gtut-tour-11-explicitwait.doc b/doc/gtut-tour-11-explicitwait.doc
index 37dade0d33..7d3bcd8b35 100644
--- a/doc/gtut-tour-11-explicitwait.doc
+++ b/doc/gtut-tour-11-explicitwait.doc
@@ -92,7 +92,7 @@ definition discrepency.
 
 Here, there is no payload attached to the messages.
 
-\dontinclude 11-explicitwait.c
+\don'tinclude 11-explicitwait.c
 \skip message_declaration
 \until }
 
@@ -117,7 +117,7 @@ Note that this is where the explicit wait feature is used.
 
 The core of our distributed service is implemented (protocol, actions on
 server side, and accessing function on client side). We should now
-initialize the server and let it wait for incomming messages. 
+initialize the server and let it wait for incoming messages. 
 
 Defining when to stop the server can become tricky. The simplest solution is
 to never let the server stop. It simply runs forever. But the simulator will
@@ -129,7 +129,7 @@ service, the server stops. This would be a bit difficult to implement
 Here, we will just hardcode that the clients ask 5 times for the token, and
 that there is two clients. This clearly simplify the problem.
 
-\dontinclude 11-explicitwait.c
+\don'tinclude 11-explicitwait.c
 \skip gras_userdata_new
 \until gras_msg_handle
 
diff --git a/doc/gtut-tour-recap-messages.doc b/doc/gtut-tour-recap-messages.doc
index 2f34294933..ea78dbb1b2 100644
--- a/doc/gtut-tour-recap-messages.doc
+++ b/doc/gtut-tour-recap-messages.doc
@@ -93,7 +93,7 @@ execute when a process receives the given request. In other words, you want
 to attach a callback to the message. Of course, you usualy don't want to do
 so on every nodes, but only on "servers" or "workers" or such. First of all,
 you need to declare the callback itself. This function that will be executed
-on request incomming must follow a very specific prototype (the same
+on request incoming must follow a very specific prototype (the same
 regardless of the call semantic): 
 
 \verbatim
diff --git a/doc/install.doc b/doc/install.doc
index ce35441cd4..935fc528ef 100644
--- a/doc/install.doc
+++ b/doc/install.doc
@@ -54,7 +54,6 @@ For Windows :
 	enable_supernovae       	ON/OFF or TRUE/FALSE or 1/0
 	enable_msg_deprecated   	ON/OFF or TRUE/FALSE or 1/0                                                                                                                                                                                                                                                                               
 	enable_print_message    	ON/OFF or TRUE/FALSE or 1/0 
-	custom_flags 			<flags>
 	gtnets_path			<path_to_gtnets_directory>
 	ns3_path			<path_to_ns3_directory>
 	CMAKE_INSTALL_PREFIX		<path_to_install_directory>
@@ -101,8 +100,6 @@ For Windows :
   
   \li enable_print_message : When set to true configuration print more debug output.
   
-  \li custom_flags : If user wants to use a specific flag during compilation, give here.
-
   \li gtnets_path : Path to gtnets install directory (ex /usr)
   
   \li ns3_path : Path to ns3 install directory (ex /usr)
@@ -135,7 +132,6 @@ enable_jedule 	 		off
 enable_latency_bound_tracking 	off 
 enable_lib_static		off
 CMAKE_INSTALL_PREFIX		/usr/local
-custom_flags			null
 gtnets_path			null
 pipol_user			null
 \endverbatim
diff --git a/doc/module-gras.doc b/doc/module-gras.doc
index d3a7587440..b6ce85fce1 100644
--- a/doc/module-gras.doc
+++ b/doc/module-gras.doc
@@ -176,7 +176,7 @@
 	
     <hr>
 
-    \dontinclude gras/ping/ping_common.c
+    \don'tinclude gras/ping/ping_common.c
     
     \section GRAS_ex_ping_common 1) Common code to the client and the server 
     
@@ -190,7 +190,7 @@
     
     The module header <tt>ping.h</tt> reads:
     
-    \dontinclude gras/ping/ping.h
+    \don'tinclude gras/ping/ping.h
     \skip include
     \until argv
     \until argv
@@ -203,7 +203,7 @@
     (to exchange more complicated types, see \ref GRAS_dd or 
     \ref GRAS_ex_mmrpc for an example).
 
-    \dontinclude gras/ping/ping_common.c
+    \don'tinclude gras/ping/ping_common.c
     \skip register_messages
     \until }
 
@@ -218,7 +218,7 @@
     struct definition so that they can be handled properly in GRAS (see the
     \ref GRAS_tut_tour_globals for more info).
 
-    \dontinclude gras/ping/ping_server.c
+    \don'tinclude gras/ping/ping_server.c
     \skip typedef struct
     \until }
     
@@ -249,7 +249,7 @@
     This function is quite straightforward, and the inlined comments should
     be enough to understand it.
 
-    \dontinclude gras/ping/ping_client.c
+    \don'tinclude gras/ping/ping_client.c
     \skip client
     \until end_of_client
 
@@ -300,7 +300,7 @@
    message to the next node. That is why we have to store all variable in a
    global, as explained in the \ref GRAS_globals section. 
 
-   \dontinclude examples/gras/mutual_exclusion/simple_token/simple_token.c
+   \don'tinclude examples/gras/mutual_exclusion/simple_token/simple_token.c
    \skip typedef
    \until }
    
@@ -375,7 +375,7 @@
     This loads the gras header and declare the function's prototypes as well
     as the matrix size.
 
-    \dontinclude gras/mmrpc/mmrpc.h
+    \don'tinclude gras/mmrpc/mmrpc.h
     \skip include
     \until argv
     \until argv
@@ -395,7 +395,7 @@
     \ref XBT_LOG_NEW_DEFAULT_CATEGORY here and 
     \ref XBT_LOG_EXTERNAL_DEFAULT_CATEGORY in mmrpc_client.c and mmrpc_server.c.
     
-    \dontinclude gras/mmrpc/mmrpc_common.c
+    \don'tinclude gras/mmrpc/mmrpc_common.c
     \skip include
     \until XBT_LOG
 
@@ -421,7 +421,7 @@
     \ref XBT_DEFINE_TYPE symbols don't get included here. Likewise, we use 
     \ref XBT_LOG_EXTERNAL_DEFAULT_CATEGORY to get the log category in here.
     
-    \dontinclude gras/mmrpc/mmrpc_server.c
+    \don'tinclude gras/mmrpc/mmrpc_server.c
     \skip define
     \until XBT_LOG
 
@@ -456,7 +456,7 @@
     datatype parsing and log categories do work even if we are using several
     files.  
     
-    \dontinclude gras/mmrpc/mmrpc_client.c
+    \don'tinclude gras/mmrpc/mmrpc_client.c
     \skip define
     \until XBT_LOG
 
@@ -465,7 +465,7 @@
     This function is quite straightforward, and the inlined comments should
     be enough to understand it.
 
-    \dontinclude gras/mmrpc/mmrpc_client.c
+    \don'tinclude gras/mmrpc/mmrpc_client.c
     \skip argv
     \until end_of_client
 
@@ -509,7 +509,7 @@
      - \ref GRAS_ex_timer_repeat
      - \ref GRAS_ex_timer_main
 
-    \dontinclude timer.c
+    \don'tinclude timer.c
     
     \section GRAS_ex_timer_decl   1. Declarations and headers
     \skip include
diff --git a/doc/module-msg.doc b/doc/module-msg.doc
index 3df79feacb..ab7014224e 100644
--- a/doc/module-msg.doc
+++ b/doc/module-msg.doc
@@ -19,6 +19,7 @@
    - \ref m_task_management
    - \ref msg_file_management
    - \ref msg_task_usage
+   - \ref msg_VMs
    - \ref msg_trace_driven
    - \ref msg_deprecated_functions
 
@@ -87,6 +88,23 @@ details).
  *         by a process to execute, communicate or otherwise handle some task.
  */
 
+/** @defgroup msg_VMs VMs
+ *  @ingroup MSG_API
+ *  @brief This section describes the interface created to mimick IaaS clouds.
+ *
+ *  With it, you can create virtual machines to put your processes
+ *  into, and interact directly with the VMs to manage groups of
+ *  processes. 
+ *
+ *  This interface is highly experimental at this point. Testing is
+ *  welcomed, but do not expect too much of it right now. Even the
+ *  interfaces may be changed in future releases of SimGrid (although
+ *  things are expected to stabilize nicely before SimGrid v3.8).
+ *  There is no guaranty on the rest of SimGrid, and there is less
+ *  than that on this part.
+ *
+ */
+
 /** @defgroup msg_file_management File Management Functions
  *  @ingroup MSG_API
  *  @brief This section describes the file structure of MSG
@@ -191,7 +209,7 @@ an external description of the deployment.
 
 <hr> 
 
-\dontinclude msg/icomms/peer.c
+\don'tinclude msg/icomms/peer.c
 
 \section MSG_ext_icomms_code Code of the application
 
@@ -254,7 +272,7 @@ This initializes MSG, runs a simulation, and free all data-structures created by
 
 \until end_of_main
 
-\dontinclude msg/icomms/peer2.c
+\don'tinclude msg/icomms/peer2.c
 
 \section MSG_ext_icomms_fct_Waitall Waitall function for sender
 
@@ -269,13 +287,13 @@ The MSG_comm_waitany() function return the place of the first message send or re
 
 \subsection MSG_ext_icomms_fct_Waitany_sender From a sender
 We can use this function to wait all sent messages.
-\dontinclude msg/icomms/peer3.c
+\don'tinclude msg/icomms/peer3.c
 \skipline Sender function
 \until end_of_sender
 
 \subsection MSG_ext_icomms_fct_Waitany_receiver From a receiver
 We can also wait for the arrival of all messages.
-\dontinclude msg/icomms/peer3.c
+\don'tinclude msg/icomms/peer3.c
 \skipline Receiver function
 \until end_of_receiver
 
@@ -303,7 +321,7 @@ and an external description of the deployment.
  
 <hr> 
 
-\dontinclude msg/masterslave/masterslave_forwarder.c
+\don'tinclude msg/masterslave/masterslave_forwarder.c
 
 \section MSG_ext_ms_code Code of the application
 
@@ -401,7 +419,7 @@ This initializes MSG, runs a simulation, and free all data-structures created by
        - \ref MSG_ext_ms_platform
        
        
-      \dontinclude lua/masterslave/master_slave.lua
+      \don'tinclude lua/masterslave/master_slave.lua
       
       \section MSG_ext_ms_code_lua Code of the application
       
@@ -454,7 +472,7 @@ This initializes MSG, runs a simulation, and free all data-structures created by
        - \ref MSG_ext_ms_core_lua
        
        
-      \dontinclude lua/console/master_slave_bypass.lua
+      \don'tinclude lua/console/master_slave_bypass.lua
       
       \section MSG_ext_ms_code_lua Code of the application
       
diff --git a/doc/surf_nutshell.fig b/doc/surf_nutshell.fig
index d5d5962d96..bca88ddc1a 100644
--- a/doc/surf_nutshell.fig
+++ b/doc/surf_nutshell.fig
@@ -800,7 +800,7 @@ Single
 2 2 0 1 0 7 250 -1 20 0.000 0 0 -1 0 0 5
 	 21555 3870 19125 3870 19125 7470 21555 7470 21555 3870
 4 0 0 240 -1 0 12 0.0000 2 90 435 19260 4635 name\001
-4 0 0 240 -1 0 12 0.0000 2 180 2385 19260 7110 incomming_communications\001
+4 0 0 240 -1 0 12 0.0000 2 180 2385 19260 7110 incoming_communications\001
 4 0 0 240 -1 0 12 0.0000 2 180 2205 19260 7335 outgoing_communications\001
 4 0 0 240 -1 0 12 0.0000 2 135 165 19260 6885 id\001
 4 0 0 240 -1 0 12 0.0000 2 180 1200 19260 4410 type (cpu|link)\001
diff --git a/examples/gras/console/ping_server.c b/examples/gras/console/ping_server.c
index bb01301560..f1324b19ae 100644
--- a/examples/gras/console/ping_server.c
+++ b/examples/gras/console/ping_server.c
@@ -88,7 +88,7 @@ int server(int argc, char *argv[])
         xbt_socket_my_port(globals->sock));
   globals->endcondition = 0;
 
-  /* 6. Wait up to 20 minutes for an incomming message to handle */
+  /* 6. Wait up to 20 minutes for an incoming message to handle */
   gras_msg_handle(20.0);
 
   /* 7. Housekeeping */
diff --git a/examples/gras/mmrpc/mmrpc.c b/examples/gras/mmrpc/mmrpc.c
index f5998a5623..fa9de31e35 100644
--- a/examples/gras/mmrpc/mmrpc.c
+++ b/examples/gras/mmrpc/mmrpc.c
@@ -81,7 +81,7 @@ int server(int argc, char *argv[])
   /* 5. Register my callback */
   gras_cb_register("request", &server_cb_request_handler);
 
-  /* 6. Wait up to 10 minutes for an incomming message to handle */
+  /* 6. Wait up to 10 minutes for an incoming message to handle */
   gras_msg_handle(600.0);
 
   /* 7. Free the allocated resources, and shut GRAS down */
diff --git a/examples/gras/mmrpc/mmrpc_server.c b/examples/gras/mmrpc/mmrpc_server.c
index e3a1910e94..d1585f5f90 100644
--- a/examples/gras/mmrpc/mmrpc_server.c
+++ b/examples/gras/mmrpc/mmrpc_server.c
@@ -73,7 +73,7 @@ int server(int argc, char *argv[])
   XBT_INFO("Launch server (port=%d)", port);
   sock = try_gras_socket_server(port);
 
-  /* 6. Wait up to 10 minutes for an incomming message to handle */
+  /* 6. Wait up to 10 minutes for an incoming message to handle */
   gras_msg_handle(600.0);
 
   /* 7. Free the allocated resources, and shut GRAS down */
diff --git a/examples/gras/mutual_exclusion/simple_token/simple_token.c b/examples/gras/mutual_exclusion/simple_token/simple_token.c
index 90d687224c..ef8045887f 100644
--- a/examples/gras/mutual_exclusion/simple_token/simple_token.c
+++ b/examples/gras/mutual_exclusion/simple_token/simple_token.c
@@ -171,7 +171,7 @@ int node(int argc, char *argv[])
     }
   }
 
-  /* 8. Wait up to 10 seconds for an incomming message to handle */
+  /* 8. Wait up to 10 seconds for an incoming message to handle */
   while (globals->remaining_loop > (globals->create ? -1 : 0)) {
     gras_msg_handle(-1);
 
diff --git a/examples/gras/ping/ping_server.c b/examples/gras/ping/ping_server.c
index ab4f75e5d5..ccb590c438 100644
--- a/examples/gras/ping/ping_server.c
+++ b/examples/gras/ping/ping_server.c
@@ -88,7 +88,7 @@ int server(int argc, char *argv[])
         xbt_socket_my_port(globals->sock));
   globals->endcondition = 0;
 
-  /* 6. Wait up to 10 minutes for an incomming message to handle */
+  /* 6. Wait up to 10 minutes for an incoming message to handle */
   gras_msg_handle(10.0);
 
   /* 7. Housekeeping */
diff --git a/examples/gras/rpc/rpc.c b/examples/gras/rpc/rpc.c
index 4d120038a1..a12da5348f 100644
--- a/examples/gras/rpc/rpc.c
+++ b/examples/gras/rpc/rpc.c
@@ -370,7 +370,7 @@ int server(int argc, char *argv[])
 
   XBT_INFO("Listening on port %d", xbt_socket_my_port(mysock));
 
-  /* 5. Wait for the ping incomming messages */
+  /* 5. Wait for the ping incoming messages */
 
   /** \bug if the server is gone before the forwarder tries to connect,
      it dies awfully with the following message. The problem stands somewhere
diff --git a/examples/lua/state_cloner/deployment_duplicated_globals.xml b/examples/lua/state_cloner/deployment_duplicated_globals.xml
index aca62021da..91a3f464a0 100644
--- a/examples/lua/state_cloner/deployment_duplicated_globals.xml
+++ b/examples/lua/state_cloner/deployment_duplicated_globals.xml
@@ -7,7 +7,7 @@
   <process host="Bourassa" function="replace">
     <argument value="Calling replace() from Bourassa"/>
   </process>
-  <process host="Jupiter" function="please_dont_replace_me">
-    <argument value="Calling please_dont_replace_me() from Jupiter"/>
+  <process host="Jupiter" function="please_don't_replace_me">
+    <argument value="Calling please_don't_replace_me() from Jupiter"/>
   </process>
 </platform>
diff --git a/examples/lua/state_cloner/duplicated_globals.lua b/examples/lua/state_cloner/duplicated_globals.lua
index 70366bb8da..c0e1518bd3 100644
--- a/examples/lua/state_cloner/duplicated_globals.lua
+++ b/examples/lua/state_cloner/duplicated_globals.lua
@@ -13,19 +13,19 @@ function set_global_string(...)
   print_global()
 end
 
--- Replaces the function please_dont_change_me() by set_global_string()
+-- Replaces the function please_don't_change_me() by set_global_string()
 -- and calls it
 function replace(...)
 
-  simgrid.info("Overwriting function please_dont_replace_me()")
-  please_dont_replace_me = set_global_string
-  please_dont_replace_me(...)
+  simgrid.info("Overwriting function please_don't_replace_me()")
+  please_don't_replace_me = set_global_string
+  please_don't_replace_me(...)
 end
 
 -- Shows a hello message and prints the global string
-function please_dont_replace_me(...)
+function please_don't_replace_me(...)
 
-  simgrid.info("Hello from please_dont_replace_me(). I'm lucky, I still exist in this state.")
+  simgrid.info("Hello from please_don't_replace_me(). I'm lucky, I still exist in this state.")
   print_global()
 end
 
diff --git a/examples/lua/state_cloner/duplicated_globals.tesh b/examples/lua/state_cloner/duplicated_globals.tesh
index c8029d71d9..97ade40e0c 100644
--- a/examples/lua/state_cloner/duplicated_globals.tesh
+++ b/examples/lua/state_cloner/duplicated_globals.tesh
@@ -4,8 +4,8 @@ $ lua duplicated_globals.lua
 > [0.000000] [lua/INFO] Global string is 'A global string set by maestro'
 > [Tremblay:set_global_string:(1) 0.000000] [lua/INFO] Changing the global string
 > [Tremblay:set_global_string:(1) 0.000000] [lua/INFO] Global string is 'Calling set_global_string() from Tremblay'
-> [Bourassa:replace:(2) 0.000000] [lua/INFO] Overwriting function please_dont_replace_me()
+> [Bourassa:replace:(2) 0.000000] [lua/INFO] Overwriting function please_don't_replace_me()
 > [Bourassa:replace:(2) 0.000000] [lua/INFO] Changing the global string
 > [Bourassa:replace:(2) 0.000000] [lua/INFO] Global string is 'Calling replace() from Bourassa'
-> [Jupiter:please_dont_replace_me:(3) 0.000000] [lua/INFO] Hello from please_dont_replace_me(). I'm lucky, I still exist in this state.
-> [Jupiter:please_dont_replace_me:(3) 0.000000] [lua/INFO] Global string is 'A global string set by maestro'
+> [Jupiter:please_don't_replace_me:(3) 0.000000] [lua/INFO] Hello from please_don't_replace_me(). I'm lucky, I still exist in this state.
+> [Jupiter:please_don't_replace_me:(3) 0.000000] [lua/INFO] Global string is 'A global string set by maestro'
diff --git a/examples/msg/cloud/CMakeLists.txt b/examples/msg/cloud/CMakeLists.txt
new file mode 100644
index 0000000000..3103f3edf9
--- /dev/null
+++ b/examples/msg/cloud/CMakeLists.txt
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+
+add_executable(masterslave_virtual_machines "masterslave_virtual_machines.c")
+
+### Add definitions for compile
+if(WIN32)
+  target_link_libraries(masterslave_virtual_machines simgrid )
+else(WIN32)
+  target_link_libraries(masterslave_virtual_machines simgrid m )
+endif(WIN32)
diff --git a/examples/msg/cloud/masterslave_virtual_machines.c b/examples/msg/cloud/masterslave_virtual_machines.c
new file mode 100644
index 0000000000..0ed5b9069d
--- /dev/null
+++ b/examples/msg/cloud/masterslave_virtual_machines.c
@@ -0,0 +1,216 @@
+/* Copyright (c) 2007-2012. The SimGrid Team. All rights reserved.                             */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#include <stdio.h>
+#include "msg/msg.h"            /* Yeah! If you want to use msg, you need to include msg/msg.h */
+#include "xbt/sysdep.h"         /* calloc, printf */
+
+/* Create a log channel to have nice outputs. */
+#include "xbt/log.h"
+#include "xbt/asserts.h"
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
+                             "Messages specific for this msg example");
+
+/** @addtogroup MSG_examples
+ * 
+ *  - <b>cloud/masterslave_virtual_machines.c: Master/slaves
+ *    example, à la cloud</b>. The classical example revisited to demonstrate the use of virtual machines.
+ */
+
+double task_comp_size = 10000000;
+double task_comm_size = 10000000;
+
+
+int master(int argc, char *argv[]);
+int slave_fun(int argc, char *argv[]);
+
+static void work_batch(int slaves_count) {
+  int i;
+  for (i = 0; i < slaves_count; i++) {
+    char taskname_buffer[64];
+    char mailbox_buffer[64];
+
+    sprintf(taskname_buffer, "Task_%d", i);
+    sprintf(mailbox_buffer,"Slave_%d",i);
+
+    XBT_INFO("Sending \"%s\" to \"%s\"",taskname_buffer,mailbox_buffer);
+    MSG_task_send(MSG_task_create(taskname_buffer, task_comp_size, task_comm_size,NULL),
+        mailbox_buffer);
+  }
+}
+
+int master(int argc, char *argv[]) {
+  int slaves_count = 10;
+  m_host_t *slaves = xbt_new(m_host_t,10);
+
+  int i;
+
+  /* Retrive the hostnames constituting our playground today */
+  for (i = 1; i < argc; i++) {
+    slaves[i - 1] = MSG_get_host_by_name(argv[i]);
+    xbt_assert(slaves[i - 1] != NULL, "Cannot use inexistent host %s", argv[i]);
+  }
+
+  /* Launch the sub processes: one VM per host, with one process inside each */
+
+  for (i=0;i<slaves_count;i++) {
+    char slavename[64];
+    sprintf(slavename,"Slave %d",i);
+    char**argv=xbt_new(char*,3);
+    argv[0] = xbt_strdup(slavename);
+    argv[1] = bprintf("%d",i);
+    argv[2] = NULL;
+    msg_vm_t vm = MSG_vm_start(slaves[i],2);
+    MSG_vm_bind(vm, MSG_process_create_with_arguments(slavename,slave_fun,NULL,slaves[i],2,argv));
+  }
+
+  xbt_dynar_t vms = MSG_vms_as_dynar();
+  XBT_INFO("Launched %ld VMs", xbt_dynar_length(vms));
+
+  /* Send a bunch of work to every one */
+  XBT_INFO("Send a first batch of work to every one");
+  work_batch(slaves_count);
+
+  XBT_INFO("Now suspend all VMs, just for fun");
+  for (i=0;i<xbt_dynar_length(vms);i++)
+    MSG_vm_suspend(xbt_dynar_get_as(vms,i,msg_vm_t));
+
+  XBT_INFO("Wait a while");
+  MSG_process_sleep(2);
+
+  XBT_INFO("Enough. Let's resume everybody.");
+  for (i=0;i<xbt_dynar_length(vms);i++)
+    MSG_vm_resume(xbt_dynar_get_as(vms,i,msg_vm_t));
+
+  XBT_INFO("Sleep long enough for everyone to be done with previous batch of work");
+  MSG_process_sleep(1000-MSG_get_clock());
+
+  XBT_INFO("Add one more process per VM, and dispatch a batch of work to everyone");
+  for (i=0;i<xbt_dynar_length(vms);i++) {
+    msg_vm_t vm = xbt_dynar_get_as(vms,i,msg_vm_t);
+    char slavename[64];
+    sprintf(slavename,"Slave %ld",i+xbt_dynar_length(vms));
+    char**argv=xbt_new(char*,3);
+    argv[0] = xbt_strdup(slavename);
+    argv[1] = bprintf("%ld",i+xbt_dynar_length(vms));
+    argv[2] = NULL;
+    MSG_vm_bind(vm, MSG_process_create_with_arguments(slavename,slave_fun,NULL,slaves[i],2,argv));
+  }
+  work_batch(slaves_count*2);
+
+  XBT_INFO("Migrate everyone to the second host.");
+  for (i=0;i<xbt_dynar_length(vms);i++)
+    MSG_vm_migrate(xbt_dynar_get_as(vms,i,msg_vm_t),slaves[1]);
+
+  XBT_INFO("Suspend everyone, move them to the third host, and resume them.");
+  for (i=0;i<xbt_dynar_length(vms);i++) {
+    msg_vm_t vm = xbt_dynar_get_as(vms,i,msg_vm_t);
+    MSG_vm_suspend(vm);
+    MSG_vm_migrate(vm,slaves[2]);
+    MSG_vm_resume(vm);
+  }
+
+
+
+  XBT_INFO("Let's shut down the simulation. 10 first processes will be shut down cleanly while the second half will forcefully get killed");
+  for (i = 0; i < slaves_count; i++) {
+    char mailbox_buffer[64];
+    sprintf(mailbox_buffer,"Slave_%d",i);
+    m_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
+    MSG_task_send(finalize, mailbox_buffer);
+  }
+
+  for (i=0;i<xbt_dynar_length(vms);i++) {
+    msg_vm_t vm = xbt_dynar_get_as(vms,i,msg_vm_t);
+    MSG_vm_shutdown(vm);
+  }
+
+  XBT_INFO("Goodbye now!");
+  free(slaves);
+  xbt_dynar_free(&vms);
+  return 0;
+}                               /* end_of_master */
+
+/** Receiver function  */
+int slave_fun(int argc, char *argv[])
+{
+  char *mailbox_name;
+  m_task_t task = NULL;
+  _XBT_GNUC_UNUSED int res;
+
+  /* since the slaves will move around, use slave_%d as mailbox names instead of hostnames */
+  xbt_assert(argc>=2, "slave processes need to be given their rank as parameter");
+  mailbox_name=bprintf("Slave_%s",argv[1]);
+
+  while (1) {
+    res = MSG_task_receive(&(task),mailbox_name);
+    xbt_assert(res == MSG_OK, "MSG_task_get failed");
+
+    XBT_INFO("Received \"%s\" from mailbox %s", MSG_task_get_name(task),mailbox_name);
+    if (!strcmp(MSG_task_get_name(task), "finalize")) {
+      MSG_task_destroy(task);
+      break;
+    }
+
+    MSG_task_execute(task);
+    XBT_INFO("\"%s\" done", MSG_task_get_name(task));
+    MSG_task_destroy(task);
+    task = NULL;
+  }
+  free(mailbox_name);
+  return 0;
+}                               /* end_of_slave */
+
+/** Main function */
+int main(int argc, char *argv[])
+{
+  MSG_error_t res = MSG_OK;
+  xbt_dynar_t hosts_dynar;
+  m_host_t*hosts= xbt_new(m_host_t,10);
+  char**hostnames= xbt_new(char*,10);
+  char**masterargv=xbt_new(char*,12);
+  int i;
+
+  /* Get the arguments */
+  MSG_global_init(&argc, argv);
+  if (argc < 2) {
+    printf("Usage: %s platform_file\n", argv[0]);
+    printf("example: %s msg_platform.xml\n", argv[0]);
+    exit(1);
+  } if (argc>2) {
+    printf("Usage: %s platform_file\n", argv[0]);
+    printf("Other parameters (such as the deployment file) are ignored.");
+  }
+
+  /* load the platform file */
+  MSG_create_environment(argv[1]);
+  /* Retrieve the 10 first hosts of the platform file */
+  hosts_dynar = MSG_hosts_as_dynar();
+  xbt_assert(xbt_dynar_length(hosts_dynar)>10,
+      "I need at least 10 hosts in the platform file, but %s contains only %ld hosts_dynar.",
+      argv[1],xbt_dynar_length(hosts_dynar));
+  for (i=0;i<10;i++) {
+    hosts[i] = xbt_dynar_get_as(hosts_dynar,i,m_host_t);
+    hostnames[i] = xbt_strdup(MSG_host_get_name(hosts[i]));
+  }
+  masterargv[0]=xbt_strdup("master");
+  for (i=1;i<11;i++) {
+    masterargv[i] = xbt_strdup(MSG_host_get_name(hosts[i-1]));
+  }
+  masterargv[11]=NULL;
+  MSG_process_create_with_arguments("master",master,NULL,hosts[0],11,masterargv);
+  res = MSG_main();
+  XBT_INFO("Simulation time %g", MSG_get_clock());
+
+  MSG_clean();
+  free(hosts);
+  free(hostnames);
+  xbt_dynar_free(&hosts_dynar);
+
+  if (res == MSG_OK)
+    return 0;
+  else
+    return 1;
+}                               /* end_of_main */
diff --git a/examples/msg/cloud/masterslave_virtual_machines.xml b/examples/msg/cloud/masterslave_virtual_machines.xml
new file mode 100644
index 0000000000..83bcdda2ec
--- /dev/null
+++ b/examples/msg/cloud/masterslave_virtual_machines.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+  <!-- The master process (with some arguments) -->
+  <process host="Tremblay" function="master">
+     <argument value="20"/>       <!-- Number of tasks -->
+     <argument value="50000000"/>  <!-- Computation size of tasks -->
+     <argument value="1000000"/>   <!-- Communication size of tasks -->
+     <argument value="Jupiter"/>  <!-- First slave -->
+     <argument value="Fafard"/>   <!-- Second slave -->
+     <argument value="Ginette"/>  <!-- Third slave -->
+     <argument value="Bourassa"/> <!-- Last slave -->
+  </process>
+  <!-- The slave process (with no argument) -->
+  <process host="Tremblay" function="slave"/>
+  <process host="Jupiter" function="slave"/>
+  <process host="Fafard" function="slave"/>
+  <process host="Ginette" function="slave"/>
+  <process host="Bourassa" function="slave"/>
+</platform>
diff --git a/include/gras/messages.h b/include/gras/messages.h
index d2595c5460..56dde92a8f 100644
--- a/include/gras/messages.h
+++ b/include/gras/messages.h
@@ -164,8 +164,8 @@ XBT_PUBLIC(void) gras_msg_send_(xbt_socket_t sock,
  *  @hideinitializer
  * @param timeout: How long should we wait for this message.
  * @param msgt_want: type of awaited msg
- * @param[out] expeditor: where to create a socket to answer the incomming message
- * @param[out] payload: where to write the payload of the incomming message
+ * @param[out] expeditor: where to create a socket to answer the incoming message
+ * @param[out] payload: where to write the payload of the incoming message
  * @return the error code (or no_error).
  *
  * Every message of another type received before the one waited will be queued
@@ -193,7 +193,7 @@ XBT_PUBLIC(void) gras_msg_handle(double timeOut);
  * right answer from the right host and so on.  Any exception raised on the
  * server is also passed over the network to the client.
  * 
- * Callbacks are attached to RPC incomming messages the regular way using
+ * Callbacks are attached to RPC incoming messages the regular way using
  * \ref gras_cb_register.
  * 
  * For an example of use, check the examples/gras/rpc directory of the distribution.
@@ -272,7 +272,7 @@ typedef enum {
      group communication
    */
 
-  e_gras_msg_kind_count = 5     /* sentinel, dont mess with */
+  e_gras_msg_kind_count = 5     /* sentinel, don't mess with */
 } e_gras_msg_kind_t;
 
 
diff --git a/include/gras/timer.h b/include/gras/timer.h
index fa6e7c0012..40c3062480 100644
--- a/include/gras/timer.h
+++ b/include/gras/timer.h
@@ -28,7 +28,7 @@ SG_BEGIN_DECL()
  *  and such within a specific process.
  *
  *  Timers are served by the gras_handle() function: if there is an elapsed 
- *  timer, the associated code gets executed before any incomming connexion 
+ *  timer, the associated code gets executed before any incoming connexion 
  *  are checked. 
  *
  *  The section \ref GRAS_ex_timer constitutes a perfect example of these features.
diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index 79fc90ae62..c2c2e614c1 100644
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2004, 2005, 2007, 2008, 2009, 2010. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2012. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -31,6 +30,7 @@ typedef struct s_smx_rvpoint *msg_mailbox_t;
 /* ******************************** Host ************************************ */
 
 typedef struct m_host {
+  xbt_swag_t vms;
   smx_host_t smx_host;          /**< SIMIX representation of this host   */
 #ifdef MSG_USE_DEPRECATED
   msg_mailbox_t *mailboxes;     /**< the channels  */
diff --git a/include/msg/msg.h b/include/msg/msg.h
index dfdb2a499e..5280a31f2d 100644
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2012. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -287,7 +286,59 @@ XBT_PUBLIC(int) MSG_get_channel_number(void);
 
 #include "instr/instr.h"
 
-/* Used only by the bindings */
+/** @brief Opaque type describing a Virtual Machine.
+ *  @ingroup msg_VMs
+ *
+ * All this is highly experimental and the interface will probably change in the future.
+ * Please don't depend on this yet (although testing is welcomed if you feel so).
+ * Usual lack of guaranty of any kind applies here, and is even increased.
+ *
+ */
+typedef struct msg_vm *msg_vm_t;
+/* This function should not be called directly, but rather from MSG_vm_start_from_template that does not exist yet*/
+XBT_PUBLIC(msg_vm_t) MSG_vm_start(m_host_t location, int coreAmount);
+
+XBT_PUBLIC(int) MSG_vm_is_suspended(msg_vm_t);
+XBT_PUBLIC(int) MSG_vm_is_running(msg_vm_t);
+
+XBT_PUBLIC(void) MSG_vm_bind(msg_vm_t vm, m_process_t process);
+XBT_PUBLIC(void) MSG_vm_unbind(msg_vm_t vm, m_process_t process); // simple wrapper over process_kill
+
+XBT_PUBLIC(void) MSG_vm_migrate(msg_vm_t vm, m_host_t destination);
+
+XBT_PUBLIC(void) MSG_vm_suspend(msg_vm_t vm);
+  // \forall p in VM, MSG_process_suspend(p) // Freeze the processes
+
+XBT_PUBLIC(void) MSG_vm_resume(msg_vm_t vm);  // Simulate the fact of reading the processes from disk and resuming them
+  // \forall p in VM, MSG_process_resume(p) // unfreeze them
+
+XBT_PUBLIC(void) MSG_vm_shutdown(msg_vm_t vm); // killall
+
+XBT_PUBLIC(xbt_dynar_t) MSG_vms_as_dynar(void);
+
+/*
+void* MSG_process_get_property(msg_process_t, char* key)
+void MSG_process_set_property(msg_process_t, char* key, void* data)
+void MSG_vm_set_property(msg_vm_t, char* key, void* data)
+
+void MSG_vm_setMemoryUsed(msg_vm_t vm, double size);
+void MSG_vm_setCpuUsed(msg_vm_t vm, double inducedLoad);
+  // inducedLoad: un pourcentage (>100 si ca charge plus d'un coeur;
+  //                              <100 si c'est pas CPU intensive)
+  // Contraintes à poser:
+  //   HOST_Power >= CpuUsedVm (\forall VM) + CpuUsedTask (\forall Task)
+  //   VM_coreAmount >= Load de toutes les tasks
+*/
+
+  /*
+xbt_dynar_t<msg_vm_t> MSG_vm_get_list_from_host(msg_host_t)
+xbt_dynar_t<msg_vm_t> MSG_vm_get_list_from_hosts(msg_dynar_t<msg_host_t>)
++ des fonctions de filtrage sur les dynar
+*/
+
+
+/* ****************************************************************************************** */
+/* Used only by the bindings -- unclean pimple, please ignore if you're not writing a binding */
 XBT_PUBLIC(smx_context_t) MSG_process_get_smx_ctx(m_process_t process);
 
 SG_END_DECL()
diff --git a/include/xbt/config.h b/include/xbt/config.h
index 023f70ae61..5cf4b5331a 100644
--- a/include/xbt/config.h
+++ b/include/xbt/config.h
@@ -47,7 +47,7 @@ SG_BEGIN_DECL()
  *
  *  \section XBT_cfg_ex Example of use
  *
- *  \dontinclude config.c
+ *  \don'tinclude config.c
  *
  *  First, let's create a configuration set with some registered variables.
  *  This must be done by the configurable library before the user interactions.
diff --git a/include/xbt/datadesc.h b/include/xbt/datadesc.h
index bac0bc35ff..fdc1c79ec2 100644
--- a/include/xbt/datadesc.h
+++ b/include/xbt/datadesc.h
@@ -313,7 +313,7 @@ XBT_PUBLIC(xbt_datadesc_type_t)
 /* @{ */
 
 
-/** \brief Opaque type describing a type description callback persistant state. */
+/** \brief Opaque type describing a type description callback persistent state. */
 typedef struct s_xbt_cbps *xbt_cbps_t;
 
 /* callbacks prototypes */
diff --git a/include/xbt/dynar.h b/include/xbt/dynar.h
index 87b501c655..172ff10222 100644
--- a/include/xbt/dynar.h
+++ b/include/xbt/dynar.h
@@ -27,7 +27,7 @@ SG_BEGIN_DECL()
   * structure creation (of type void_f_ppvoid_t or void_f_pvoid_t).
   *
   * \section XBT_dynar_exscal Example with scalar
-  * \dontinclude dynar.c
+  * \don'tinclude dynar.c
   *
   * \skip Vars_decl
   * \skip dyn
diff --git a/include/xbt/ex.h b/include/xbt/ex.h
index b7903c152a..dfab9c2e71 100644
--- a/include/xbt/ex.h
+++ b/include/xbt/ex.h
@@ -207,7 +207,7 @@ __ex_mctx_struct} __ex_mctx_t;
  * following code which shows some pitfalls and contains many errors (assuming
  * a mallocex() function which throws an exception if malloc(3) fails):
  *
- * \dontinclude ex.c
+ * \don'tinclude ex.c
  * \skip BAD_EXAMPLE
  * \until end_of_bad_example
  *
diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c
index 6877c67d2d..11e4badf34 100644
--- a/src/bindings/lua/simgrid_lua.c
+++ b/src/bindings/lua/simgrid_lua.c
@@ -196,7 +196,7 @@ static int simgrid_gc(lua_State * L)
  */
 static int msg_register_platform(lua_State * L)
 {
-  /* Tell Simgrid we dont wanna use its parser */
+  /* Tell Simgrid we don't wanna use its parser */
   //surf_parse = console_parse_platform;
   surf_parse_reset_callbacks();
   MSG_create_environment(NULL);
diff --git a/src/gras/Msg/gras_msg_exchange.c b/src/gras/Msg/gras_msg_exchange.c
index df0243152c..34915867ef 100644
--- a/src/gras/Msg/gras_msg_exchange.c
+++ b/src/gras/Msg/gras_msg_exchange.c
@@ -136,8 +136,8 @@ gras_msg_wait_ext_(double timeout,
  *
  * @param timeout: How long should we wait for this message.
  * @param msgt_want: type of awaited msg
- * @param[out] expeditor: where to create a socket to answer the incomming message
- * @param[out] payload: where to write the payload of the incomming message
+ * @param[out] expeditor: where to create a socket to answer the incoming message
+ * @param[out] payload: where to write the payload of the incoming message
  * @return the error code (or no_error).
  *
  * Every message of another type received before the one waited will be queued
@@ -188,7 +188,7 @@ static int gras_msg_wait_or_filter(gras_msg_t msg, void *ctx)
  * @param msgt_want: a dynar containing all accepted message type
  * @param[out] ctx: the context of received message (in case it's a RPC call we want to answer to)
  * @param[out] msgt_got: indice in the dynar of the type of the received message
- * @param[out] payload: where to write the payload of the incomming message
+ * @param[out] payload: where to write the payload of the incoming message
  * @return the error code (or no_error).
  *
  * Every message of a type not in the accepted list received before the one
@@ -282,7 +282,7 @@ void gras_msg_handleall(double period)
   } while (period - now + begin > 0);
 }
 
-/** @brief Handle an incomming message or timer (or wait up to \a timeOut seconds)
+/** @brief Handle an incoming message or timer (or wait up to \a timeOut seconds)
  *
  * @param timeOut: How long to wait for incoming messages (in seconds)
  * @return the error code (or no_error).
@@ -402,7 +402,7 @@ void gras_msg_handle(volatile double timeOut)
         volatile unsigned int cpt2 = cpt;
         if (!ran_ok) {
           XBT_DEBUG
-              ("Use the callback #%u (@%p) for incomming msg '%s' (payload_size=%d)",
+              ("Use the callback #%u (@%p) for incoming msg '%s' (payload_size=%d)",
                cpt + 1, cb, msg.type->name, msg.payl_size);
           if (!cb(&ctx, msg.payl)) {
             /* cb handled the message */
diff --git a/src/gras/Msg/gras_msg_listener.c b/src/gras/Msg/gras_msg_listener.c
index a08ee25ecb..ca62d02f4a 100644
--- a/src/gras/Msg/gras_msg_listener.c
+++ b/src/gras/Msg/gras_msg_listener.c
@@ -19,7 +19,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_msg_read, gras_msg,
 
 typedef struct s_gras_msg_listener_ {
   xbt_thread_t listener; /* keep this first, gras_socket_im_the_server() does funky transtyping in sg_msg.c */
-  xbt_queue_t incomming_messages;       /* messages received from the wire and still to be used by master */
+  xbt_queue_t incoming_messages;       /* messages received from the wire and still to be used by master */
   xbt_queue_t socks_to_close;   /* let the listener close the sockets, since it may be selecting on them. Darwin don't like this trick */
   xbt_socket_t wakeup_sock_listener_side;
   xbt_socket_t wakeup_sock_master_side;
@@ -66,7 +66,7 @@ static void listener_function(void *p)
 		   I'm not the user process but I'm just the listener. Too bad */
       XBT_VERB("Got a '%s' message (%s) from sock %p. Queue it for handling by main thread",
             gras_msgtype_get_name(msg->type),e_gras_msg_kind_names[msg->kind],msg->expe);
-      xbt_queue_push(me->incomming_messages, msg);
+      xbt_queue_push(me->incoming_messages, msg);
     } else {
       char got = *(char *) msg->payl;
       if (got == '1') {
@@ -110,7 +110,7 @@ gras_msg_listener_t gras_msg_listener_launch(xbt_queue_t msg_received)
   gras_msg_listener_t arg = xbt_new0(s_gras_msg_listener_t, 1);
 
   XBT_VERB("Launch listener");
-  arg->incomming_messages = msg_received;
+  arg->incoming_messages = msg_received;
   arg->socks_to_close = xbt_queue_new(0, sizeof(int));
   arg->init_mutex = xbt_mutex_init();
   arg->init_cond = xbt_cond_init();
@@ -150,7 +150,7 @@ void gras_msg_listener_shutdown()
   xbt_thread_join(pd->listener->listener);
 
   //  gras_socket_close(pd->listener->wakeup_sock_master_side); FIXME: uncommenting this leads to deadlock at terminaison
-  xbt_queue_free(&pd->listener->incomming_messages);
+  xbt_queue_free(&pd->listener->incoming_messages);
   xbt_queue_free(&pd->listener->socks_to_close);
   xbt_free(pd->listener);
 }
diff --git a/src/gras/Virtu/virtu_private.h b/src/gras/Virtu/virtu_private.h
index 529ce8384c..462f5002da 100644
--- a/src/gras/Virtu/virtu_private.h
+++ b/src/gras/Virtu/virtu_private.h
@@ -37,7 +37,7 @@ typedef struct {
   int pid;                      /* pid of process, only for SG */
   int ppid;                     /* ppid of process, only for SG */
 
-  gras_msg_listener_t listener; /* the thread in charge of the incomming communication for this process */
+  gras_msg_listener_t listener; /* the thread in charge of the incoming communication for this process */
 } gras_procdata_t;
 
 gras_procdata_t *gras_procdata_get(void);
diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index cb06f1d970..8aa2f6c963 100644
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@ -39,6 +39,8 @@ void MSG_global_init(int *argc, char **argv)
 
   xbt_getpid = MSG_process_self_PID;
   if (!msg_global) {
+    s_msg_vm_t vm; // to compute the offset
+
     SIMIX_global_init(argc, argv);
 
     msg_global = xbt_new0(s_MSG_Global_t, 1);
@@ -50,6 +52,7 @@ void MSG_global_init(int *argc, char **argv)
     msg_global->sent_msg = 0;
     msg_global->task_copy_callback = NULL;
     msg_global->process_data_cleanup = NULL;
+    msg_global->vms = xbt_swag_new(xbt_swag_offset(vm,all_vms_hookup));
 
     /* initialization of the action module */
     _MSG_action_init();
@@ -64,6 +67,7 @@ void MSG_global_init(int *argc, char **argv)
 
   XBT_DEBUG("ADD MSG LEVELS");
   MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy);
+
 }
 
 #ifdef MSG_USE_DEPRECATED
@@ -193,6 +197,7 @@ MSG_error_t MSG_clean(void)
 
   SIMIX_clean();
 
+  xbt_swag_free(msg_global->vms);
   free(msg_global);
   msg_global = NULL;
 
diff --git a/src/msg/msg_host.c b/src/msg/msg_host.c
index dfa729e1cf..086d9bf70f 100644
--- a/src/msg/msg_host.c
+++ b/src/msg/msg_host.c
@@ -10,6 +10,8 @@
 #include "xbt/log.h"
 #include "simgrid/simix.h"
 
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg);
+
 /** @addtogroup m_host_management
  *     \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Hosts" --> \endhtmlonly
  * (#m_host_t) and the functions for managing it.
@@ -28,8 +30,10 @@ m_host_t __MSG_host_create(smx_host_t workstation)
 {
   const char *name = SIMIX_host_get_name(workstation);
   m_host_t host = xbt_new0(s_m_host_t, 1);
+  s_msg_vm_t vm; // simply to compute the offset
 
   host->smx_host = workstation;
+  host->vms = xbt_swag_new(xbt_swag_offset(vm,host_vms_hookup));
 
 #ifdef MSG_USE_DEPRECATED
   int i;
@@ -120,7 +124,11 @@ void __MSG_host_destroy(m_host_t host) {
   if (msg_global->max_channel > 0)
     free(host->mailboxes);
 #endif
-
+  if (xbt_swag_size(host->vms) > 0 ) {
+    XBT_VERB("Host %s shut down, but it still hosts %d VMs. They will be leaked.",
+        MSG_host_get_name(host),xbt_swag_size(host->vms));
+  }
+  xbt_swag_free(host->vms);
   free(host);
 }
 
diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index 55a22d6346..23699ddb44 100644
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -90,6 +90,19 @@ typedef struct msg_comm {
   MSG_error_t status;           /* status of the communication once finished */
 } s_msg_comm_t;
 
+typedef enum {
+  msg_vm_state_suspended, msg_vm_state_running, msg_vm_state_migrating
+} e_msg_vm_state_t;
+
+typedef struct msg_vm {
+  s_xbt_swag_hookup_t all_vms_hookup;
+  s_xbt_swag_hookup_t host_vms_hookup;
+  xbt_dynar_t processes;
+  e_msg_vm_state_t state;
+  m_host_t location;
+  int coreAmount;
+} s_msg_vm_t;
+
 /************************** Global variables ********************************/
 typedef struct MSG_Global {
   xbt_fifo_t host;
@@ -101,6 +114,7 @@ typedef struct MSG_Global {
   unsigned long int sent_msg;   /* Total amount of messages sent during the simulation */
   void (*task_copy_callback) (m_task_t task, m_process_t src, m_process_t dst);
   void_f_pvoid_t process_data_cleanup;
+  xbt_swag_t vms;
 } s_MSG_Global_t, *MSG_Global_t;
 
 /*extern MSG_Global_t msg_global;*/
diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c
new file mode 100644
index 0000000000..b31536f187
--- /dev/null
+++ b/src/msg/msg_vm.c
@@ -0,0 +1,143 @@
+/* Copyright (c) 2012. The SimGrid Team. All rights reserved.               */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#include "msg_private.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_vm, msg,
+                                "Cloud-oriented parts of the MSG API");
+
+/** @brief Create a new (empty) VMs
+ *  @ingroup msg_VMs
+ *
+ *  @bug it is expected that in the future, the coreAmount parameter will be used
+ *  to add extra constraints on the execution, but the argument is ignored for now.
+ */
+
+msg_vm_t MSG_vm_start(m_host_t location, int coreAmount) {
+  msg_vm_t res = xbt_new0(s_msg_vm_t,1);
+  res->all_vms_hookup.prev = NULL;
+  res->host_vms_hookup.prev = NULL;
+  res->state = msg_vm_state_running;
+  res->location = location;
+  res->coreAmount = coreAmount;
+  res->processes = xbt_dynar_new(sizeof(m_process_t),NULL);
+
+  xbt_swag_insert(res,msg_global->vms);
+  xbt_swag_insert(res,location->vms);
+
+  return res;
+}
+/** @brief Returns a newly constructed dynar containing all existing VMs in the system
+ *  @ingroup msg_VMs
+ *
+ * Don't forget to free the dynar after use.
+ */
+xbt_dynar_t MSG_vms_as_dynar(void) {
+  xbt_dynar_t res = xbt_dynar_new(sizeof(msg_vm_t),NULL);
+  msg_vm_t vm;
+  xbt_swag_foreach(vm,msg_global->vms) {
+    xbt_dynar_push(res,&vm);
+  }
+  return res;
+}
+
+/** @brief Returns whether the given VM is currently suspended
+ *  @ingroup msg_VMs
+ */
+int MSG_vm_is_suspended(msg_vm_t vm) {
+  return vm->state == msg_vm_state_suspended;
+}
+/** @brief Returns whether the given VM is currently running
+ *  @ingroup msg_VMs
+ */
+int MSG_vm_is_running(msg_vm_t vm) {
+  return vm->state == msg_vm_state_running;
+}
+/** @brief Add the given process into the VM.
+ *  @ingroup msg_VMs
+ *
+ * Afterward, when the VM is migrated or suspended or whatever, the process will have the corresponding handling, too.
+ *
+ * @bug for now, if a binded process terminates, every VM functions will segfault. Baaaad.
+ */
+void MSG_vm_bind(msg_vm_t vm, m_process_t process) {
+  xbt_dynar_push_as(vm->processes,m_process_t,process);
+}
+/** @brief Removes the given process from the given VM, and kill it
+ *  @ingroup msg_VMs
+ *
+ *  Will raise a not_found exception if the process were not binded to that VM
+ */
+void MSG_vm_unbind(msg_vm_t vm, m_process_t process) {
+  int pos = xbt_dynar_search(vm->processes,process);
+  xbt_dynar_remove_at(vm->processes,pos, NULL);
+  MSG_process_kill(process);
+}
+
+/** @brief Immediately change the host on which all processes are running
+ *  @ingroup msg_VMs
+ *
+ * No migration cost occurs. If you want to simulate this too, you want to use a
+ * MSG_task_send() before or after, depending on whether you want to do cold or hot
+ * migration.
+ */
+void MSG_vm_migrate(msg_vm_t vm, m_host_t destination) {
+  unsigned int cpt;
+  m_process_t process;
+  xbt_dynar_foreach(vm->processes,cpt,process) {
+    MSG_process_migrate(process,destination);
+  }
+  xbt_swag_remove(vm,vm->location->vms);
+  xbt_swag_insert_at_tail(vm,destination->vms);
+  vm->location = destination;
+}
+
+/** @brief Immediately suspend the execution of all processes within the given VM
+ *  @ingroup msg_VMs
+ *
+ * No suspension cost occurs. If you want to simulate this too, you want to
+ * use a \ref MSG_file_write() before or after, depending on the exact semantic
+ * of VM suspend to you.
+ */
+void MSG_vm_suspend(msg_vm_t vm) {
+  unsigned int cpt;
+  m_process_t process;
+  xbt_dynar_foreach(vm->processes,cpt,process) {
+    XBT_INFO("suspend process %s of host %s",MSG_process_get_name(process),MSG_host_get_name(MSG_process_get_host(process)));
+    MSG_process_suspend(process);
+  }
+}
+
+/** @brief Immediately resumes the execution of all processes within the given VM
+ *  @ingroup msg_VMs
+ *
+ * No resume cost occurs. If you want to simulate this too, you want to
+ * use a \ref MSG_file_read() before or after, depending on the exact semantic
+ * of VM resume to you.
+ */
+void MSG_vm_resume(msg_vm_t vm) {
+  unsigned int cpt;
+  m_process_t process;
+  xbt_dynar_foreach(vm->processes,cpt,process) {
+    XBT_INFO("resume process %s of host %s",MSG_process_get_name(process),MSG_host_get_name(MSG_process_get_host(process)));
+    MSG_process_resume(process);
+  }
+}
+
+/** @brief Immediately kills all processes within the given VM. Any memory that they allocated will be leaked.
+ *  @ingroup msg_VMs
+ *
+ * No extra delay occurs. If you want to simulate this too, you want to
+ * use a #MSG_process_sleep() or something. I'm not quite sure.
+ */
+void MSG_vm_shutdown(msg_vm_t vm) {
+  unsigned int cpt;
+  m_process_t process;
+  xbt_dynar_foreach(vm->processes,cpt,process) {
+    MSG_process_kill(process);
+  }
+}
diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index a21f74e4fc..da59e87a51 100644
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -205,9 +205,9 @@ void SIMIX_comm_destroy(smx_action_t action)
             action, action->comm.refcount, (int)action->state);
 
   if (action->comm.refcount <= 0) {
-	xbt_backtrace_display_current();
-    xbt_die("the refcount of comm %p is already 0 before decreasing it. "
-            "That's a bug!", action);
+    xbt_backtrace_display_current();
+    xbt_die("The refcount of comm %p is already 0 before decreasing it. "
+            "That's a bug! If you didn't test and/or wait the same communication twice in your code, then the bug is SimGrid's...", action);
   }
   action->comm.refcount--;
   if (action->comm.refcount > 0)
diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index 2e3ca93616..178acd252d 100644
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -140,7 +140,7 @@ typedef struct s_smx_action {
       void *dst_buff;
       size_t src_buff_size;
       size_t *dst_buff_size;
-      char copied;
+      int copied:1;                   /* whether the data were already copied */
 
       void* src_data;                     /* User data associated to communication */
       void* dst_data;
@@ -281,7 +281,7 @@ static XBT_INLINE void SIMIX_context_runall(void)
  */
 static XBT_INLINE smx_context_t SIMIX_context_self(void)
 {
-  if (simix_global && simix_global->context_factory != NULL) {
+  if (simix_global && simix_global->context_factory) {
     return simix_global->context_factory->self();
   }
 
diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index 0438918a34..a23bdda151 100644
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -1005,6 +1005,10 @@ int simcall_comm_is_latency_bounded(smx_action_t comm)
 
 smx_mutex_t simcall_mutex_init(void)
 {
+  if(!simix_global) {
+    fprintf(stderr,"You must run MSG_global_init or gras_init before using MSG or GRAS\n"); // I would have loved using xbt_die but I can't since it is not initialized yet... :)
+    abort();
+  }
   smx_simcall_t simcall = SIMIX_simcall_mine();
 
   simcall->call = SIMCALL_MUTEX_INIT;
diff --git a/src/surf/surf.c b/src/surf/surf.c
index 36980e102f..3980bb289a 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -542,7 +542,7 @@ double surf_solve(double max_date)
     }
   }
 
-  XBT_DEBUG("Min for resources (remember that NS3 dont update that value) : %f", min);
+  XBT_DEBUG("Min for resources (remember that NS3 don't update that value) : %f", min);
 
   XBT_DEBUG("Looking for next trace event");
 
diff --git a/src/xbt/datadesc/cbps.c b/src/xbt/datadesc/cbps.c
index 2810ac3815..b258d3ad68 100644
--- a/src/xbt/datadesc/cbps.c
+++ b/src/xbt/datadesc/cbps.c
@@ -1,4 +1,4 @@
-/* cbps - persistant states for callbacks                                   */
+/* cbps - persistent states for callbacks                                   */
 
 /* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
  * All rights reserved.                                                     */
@@ -9,7 +9,7 @@
 #include "xbt/ex.h"
 #include "xbt/datadesc/datadesc_private.h"
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ddt_cbps, xbt_ddt,
-                                "callback persistant state");
+                                "callback persistent state");
 
 typedef struct {
   xbt_datadesc_type_t type;
diff --git a/src/xbt/datadesc/datadesc_private.h b/src/xbt/datadesc/datadesc_private.h
index a5fd45d3b0..0c1c802ec1 100644
--- a/src/xbt/datadesc/datadesc_private.h
+++ b/src/xbt/datadesc/datadesc_private.h
@@ -234,7 +234,7 @@ xbt_datadesc_scalar(const char *name,
                      enum e_xbt_dd_scalar_encoding encoding);
 
 /****************************************************
- * Callback persistant state constructor/destructor *
+ * Callback persistent state constructor/destructor *
  ****************************************************/
 xbt_cbps_t xbt_cbps_new(void);
 void xbt_cbps_free(xbt_cbps_t * state);
diff --git a/src/xbt/log.c b/src/xbt/log.c
index 28b799cde6..a5b33d8ac0 100644
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -649,7 +649,8 @@ static void xbt_log_connect_categories(void)
   XBT_LOG_CONNECT(msg_mailbox);
   XBT_LOG_CONNECT(msg_process);
   XBT_LOG_CONNECT(msg_task);
-
+  XBT_LOG_CONNECT(msg_vm);
+   
   /* simdag */
   XBT_LOG_CONNECT(sd);
   XBT_LOG_CONNECT(sd_daxparse);
@@ -954,7 +955,7 @@ int _xbt_log_cat_init(xbt_log_category_t category,
         cpp = cpp->nextSibling;
       }
 
-      XBT_DEBUG("Childs of %s: %s; nextSibling: %s",
+      XBT_DEBUG("Children of %s: %s; nextSibling: %s",
              category->parent->name, res,
              (category->parent->nextSibling ?
               category->parent->nextSibling->name : "none"));