Further changes to support new non-contiguous memory model (checkpointing, vm informa...

[palacios.git] / linux_module / vm.c

diff --git a/linux_module/vm.c b/linux_module/vm.c
index 5584b38..ac1b363 100644 (file)
--- 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;
 }
@@ -132,16 +131,15 @@ int remove_guest_ctrl(struct v3_guest * guest, unsigned int cmd) {
 static void free_guest_ctrls(struct v3_guest * guest) {
     struct rb_node * node = rb_first(&(guest->vm_ctrls));
     struct vm_ctrl * ctrl = NULL;
-    struct rb_node * tmp_node = NULL;
 
     while (node) {
        ctrl = rb_entry(node, struct vm_ctrl, tree_node);
-       tmp_node = node;
+
        node = rb_next(node);
        
        WARNING("Cleaning up guest ctrl that was not removed explicitly (%d)\n", ctrl->cmd);
 
-       kfree(ctrl);
+       palacios_free(ctrl);
     }
 }
 
@@ -213,7 +211,7 @@ static long v3_vm_ioctl(struct file * filp,
            
            NOTICE("Saving Guest to %s:%s\n", chkpt.store, chkpt.url);
 
-           if (v3_save_vm(guest->v3_ctx, chkpt.store, chkpt.url) == -1) {
+           if (v3_save_vm(guest->v3_ctx, chkpt.store, chkpt.url, chkpt.opts) == -1) {
                WARNING("Error checkpointing VM state\n");
                return -EFAULT;
            }
@@ -231,9 +229,9 @@ static long v3_vm_ioctl(struct file * filp,
                return -EFAULT;
            }
            
-           NOTICE("Loading Guest to %s:%s\n", chkpt.store, chkpt.url);
+           NOTICE("Loading Guest from %s:%s\n", chkpt.store, chkpt.url);
 
-           if (v3_load_vm(guest->v3_ctx, chkpt.store, chkpt.url) == -1) {
+           if (v3_load_vm(guest->v3_ctx, chkpt.store, chkpt.url, chkpt.opts) == -1) {
                WARNING("Error Loading VM state\n");
                return -EFAULT;
            }
@@ -257,7 +255,7 @@ static long v3_vm_ioctl(struct file * filp,
            
            NOTICE("Sending (live-migrating) Guest to %s:%s\n",chkpt_info.store, chkpt_info.url); 
            
-           if (v3_send_vm(guest->v3_ctx, chkpt_info.store, chkpt_info.url) == -1) {
+           if (v3_send_vm(guest->v3_ctx, chkpt_info.store, chkpt_info.url, chkpt_info.opts) == -1) {
                WARNING("Error sending VM\n");
                return -EFAULT;
            }
@@ -279,7 +277,7 @@ static long v3_vm_ioctl(struct file * filp,
            
            NOTICE("Receiving (live-migrating) Guest to %s:%s\n",chkpt_info.store, chkpt_info.url);
            
-           if (v3_receive_vm(guest->v3_ctx, chkpt_info.store, chkpt_info.url) == -1) {
+           if (v3_receive_vm(guest->v3_ctx, chkpt_info.store, chkpt_info.url, chkpt_info.opts) == -1) {
                WARNING("Error receiving VM\n");
                return -EFAULT;
            }
@@ -445,7 +443,7 @@ int free_palacios_vm(struct v3_guest * guest) {
     free_guest_ctrls(guest);
 
 
-    vfree(guest->img);
+    palacios_vfree(guest->img);
     palacios_free(guest);
 
     return 0;