X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fvm.c;h=440ff69f660c391e9d8b36f83080ed9be11f22cf;hb=2cb41f7db5b9f89113432d6b3daff4807ba8e5f2;hp=ea585ab5fce2f56eed593dd3603ca4b0b22d3597;hpb=09ffb2b89e1089c43239a3c1f86d08fb7ba63b28;p=palacios.git

diff --git a/linux_module/vm.c b/linux_module/vm.c
index ea585ab..440ff69 100644
--- a/linux_module/vm.c
+++ b/linux_module/vm.c
@@ -195,6 +195,38 @@ static long v3_vm_ioctl(struct file * filp,
 	    v3_simulate_vm(guest->v3_ctx, arg);
 	    break;
 	}
+	case V3_VM_RESET: {
+	    struct v3_reset_cmd r;
+	    void __user * argp = (void __user *)arg;
+	    v3_vm_reset_type t;
+	    uint32_t core_range[2];
+
+	    if (copy_from_user(&r, argp, sizeof(struct v3_reset_cmd))) {
+		WARNING("Copy from user error getting reset info\n");
+		return -EFAULT;
+	    }
+	    
+	    if (r.type==V3_RESET_VM_ALL) { 
+		t=V3_VM_RESET_ALL;
+	    } else if (r.type==V3_RESET_VM_HRT) {
+		t=V3_VM_RESET_HRT;
+	    } else if (r.type==V3_RESET_VM_ROS) {
+		t=V3_VM_RESET_ROS;
+	    } else if (r.type==V3_RESET_VM_CORE_RANGE){
+		t=V3_VM_RESET_CORE_RANGE;
+		core_range[0]=r.first_core;
+		core_range[1]=r.first_core+r.num_cores-1;
+	    } else {
+		ERROR("Unknown reset type %d requested\n",r.type);
+		return -EFAULT;
+	    }
+	    
+	    if (v3_reset_vm_extended(guest->v3_ctx, t, core_range) == -1) {
+		WARNING("Error reseting VM\n");
+		return -EFAULT;
+	    }
+	    break;
+	}
 
 
 #ifdef V3_CONFIG_CHECKPOINT
@@ -317,13 +349,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;
 	}
@@ -385,7 +440,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");