Avoid strict-aliasing related issues when compiling with optimization

[palacios.git] / linux_module / vm.c

diff --git a/linux_module/vm.c b/linux_module/vm.c
index dd4aeda..d352c36 100644 (file)
--- a/linux_module/vm.c
+++ b/linux_module/vm.c
@@ -156,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: {
@@ -317,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;
        }
@@ -385,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");