X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fvm.c;h=d352c36439805e251cca9a936417221994685e31;hb=0246f0904a4800dbe1e8e23332d49b468a58f751;hp=b7425e403d1c110984d67af4a34f7762ffbae694;hpb=6b055801f5e04e134b779ad49bc4826179ebf6bb;p=palacios.git

diff --git a/linux_module/vm.c b/linux_module/vm.c
index b7425e4..d352c36 100644
--- a/linux_module/vm.c
+++ b/linux_module/vm.c
@@ -12,7 +12,6 @@
 #include <linux/poll.h>
 #include <linux/anon_inodes.h>
 #include <linux/sched.h>
-#include <linux/vmalloc.h>
 #include <linux/file.h>
 #include <linux/spinlock.h>
 #include <linux/rbtree.h>
@@ -124,7 +123,7 @@ int remove_guest_ctrl(struct v3_guest * guest, unsigned int cmd) {
 
     rb_erase(&(ctrl->tree_node), &(guest->vm_ctrls));
 
-    kfree(ctrl);
+    palacios_free(ctrl);
 
     return 0;
 }
@@ -140,7 +139,7 @@ static void free_guest_ctrls(struct v3_guest * guest) {
 	
 	WARNING("Cleaning up guest ctrl that was not removed explicitly (%d)\n", ctrl->cmd);
 
-	kfree(ctrl);
+	palacios_free(ctrl);
     }
 }
 
@@ -157,7 +156,7 @@ static long v3_vm_ioctl(struct file * filp,
 
     struct v3_guest * guest = filp->private_data;
 
-    INFO("V3 IOCTL %d\n", ioctl);
+    DEBUG("V3 IOCTL %d\n", ioctl);
 
     switch (ioctl) {
 	case V3_VM_LAUNCH: {
@@ -318,13 +317,36 @@ static long v3_vm_ioctl(struct file * filp,
 	    memset(&cmd, 0, sizeof(struct v3_core_move_cmd));
 	    
 	    if (copy_from_user(&cmd, argp, sizeof(struct v3_core_move_cmd))) {
-		WARNING("copy from user error getting migrate command...\n");
+		WARNING("copy from user error getting migrate core command...\n");
 		return -EFAULT;
 	    }
 	
 	    INFO("moving guest %s vcore %d to CPU %d\n", guest->name, cmd.vcore_id, cmd.pcore_id);
 
-	    v3_move_vm_core(guest->v3_ctx, cmd.vcore_id, cmd.pcore_id);
+	    if (v3_move_vm_core(guest->v3_ctx, cmd.vcore_id, cmd.pcore_id)) { 
+		ERROR("Could not move core\n");
+		return -EFAULT;
+	    }
+
+	    break;
+	}
+	case V3_VM_MOVE_MEM: {
+	    struct v3_mem_move_cmd cmd;
+	    void __user * argp = (void __user *)arg;
+
+	    memset(&cmd, 0, sizeof(struct v3_mem_move_cmd));
+	    
+	    if (copy_from_user(&cmd, argp, sizeof(struct v3_mem_move_cmd))) {
+		WARNING("copy from user error getting migrate memory command...\n");
+		return -EFAULT;
+	    }
+	
+	    INFO("moving guest %s memory at gpa %p to memory with affinity for CPU %d\n", guest->name, (void*)(cmd.gpa), cmd.pcore_id);
+
+	    if (v3_move_vm_mem(guest->v3_ctx, (void*)(cmd.gpa), cmd.pcore_id)) {
+		ERROR("Could not move memory\n");
+		return -EFAULT;
+	    }
 
 	    break;
 	}
@@ -386,7 +408,7 @@ int create_palacios_vm(struct v3_guest * guest)  {
         return -1;
     }
 
-    guest->v3_ctx = v3_create_vm(guest->img, (void *)guest, guest->name);
+    guest->v3_ctx = v3_create_vm(guest->img, (void *)guest, guest->name, (0x1 << num_online_cpus()) - 1);
 
     if (guest->v3_ctx == NULL) { 
 	WARNING("palacios: failed to create vm\n");
@@ -443,8 +465,9 @@ int free_palacios_vm(struct v3_guest * guest) {
 
     free_guest_ctrls(guest);
 
+    deinit_vm_extensions(guest);
 
-    vfree(guest->img);
+    palacios_vfree(guest->img);
     palacios_free(guest);
 
     return 0;