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

diff --git a/linux_module/vm.c b/linux_module/vm.c
index 5584b38..b7425e4 100644
--- a/linux_module/vm.c
+++ b/linux_module/vm.c
@@ -132,11 +132,10 @@ 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);
@@ -213,7 +212,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 +230,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 +256,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 +278,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;
 	    }