Merge tag 'v3_9_90' into hypervisor

[simgrid.git] / src / bindings / java / org / simgrid / msg / VM.java

diff --git a/src/bindings/java/org/simgrid/msg/VM.java b/src/bindings/java/org/simgrid/msg/VM.java
index 03edd5b..7b73404 100644 (file)
--- a/src/bindings/java/org/simgrid/msg/VM.java
+++ b/src/bindings/java/org/simgrid/msg/VM.java
@@ -1,7 +1,7 @@
 /*
  * JNI interface to virtual machine in Simgrid
  * 
- * Copyright 2006-2012 The SimGrid Team.           
+ * Copyright (c) 2006-2013. The SimGrid Team.
  * All right reserved. 
  *
  * This program is free software; you can redistribute 
@@ -23,7 +23,6 @@ public class VM extends Host{
 
         private static VM[] vms=null;    
     private Host currentHost; 
-    private int dpIntensity = 0 ; 
 
        /* Constructors / destructors */
     /**
@@ -51,7 +50,6 @@ public class VM extends Host{
                super();
                super.name = name; 
                this.currentHost = host; 
-               this.dpIntensity = dpIntensity; 
                create(host, name, nCore, ramSize, netCap, diskPath, diskSize, migNetSpeed, dpIntensity);
                VM.addVM(this);
        }
@@ -86,6 +84,7 @@ public class VM extends Host{
        
 
        /* JNI / Native code */
+
        /* get/set property methods are inherited from the Host class. */
        
        /** Returns whether the given VM is currently suspended
@@ -158,11 +157,8 @@ public class VM extends Host{
         * (pre-copy is implemented)
         */     
        public void migrate(Host destination){
-               Msg.info("Start migration of VM "+this.getName()+" to node "+destination.getName());
-               Msg.info("    dpIntensity:"+this.dpIntensity);
-               
                this.internalmig(destination);
-               Msg.info("End of migration of VM "+this.getName()+" to node "+destination.getName());
+               this.currentHost = destination; 
        }
        
        /** Immediately suspend the execution of all processes within the given VM