#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>
rb_erase(&(ctrl->tree_node), &(guest->vm_ctrls));
- kfree(ctrl);
+ palacios_free(ctrl);
return 0;
}
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);
}
}
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;
}
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;
}
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;
}
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;
}
int free_palacios_vm(struct v3_guest * guest) {
- v3_free_vm(guest->v3_ctx);
+ if (v3_free_vm(guest->v3_ctx)<0) {
+ return -1;
+ }
device_destroy(v3_class, guest->vm_dev);
free_guest_ctrls(guest);
- vfree(guest->img);
+ palacios_vfree(guest->img);
palacios_free(guest);
return 0;