Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel

Conflicts:

	linux_module/palacios-vm.c

diff --combined linux_module/palacios-vm.c
index a434f17,4f53bcb..d19e705
--- 1/linux_module/palacios-vm.c
--- 2/linux_module/palacios-vm.c
+++ b/linux_module/palacios-vm.c
@@@ -16,101 -16,13 +16,101 @@@
  #include <linux/smp_lock.h>
  #include <linux/file.h>
  #include <linux/spinlock.h>
 -
 +#include <linux/rbtree.h>
  
  #include <palacios/vmm.h>
  
  #include "palacios.h"
  #include "palacios-vm.h"
  
 +
 +struct vm_ctrl {
 +    unsigned int cmd;
 +
 +    int (*handler)(struct v3_guest * guest, 
 +                 unsigned int cmd, unsigned long arg, 
 +                 void * priv_data);
 +
 +    void * priv_data;
 +
 +    struct rb_node tree_node;
 +};
 +
 +
 +static inline struct vm_ctrl * __insert_ctrl(struct v3_guest * vm, 
 +                                           struct vm_ctrl * ctrl) {
 +    struct rb_node ** p = &(vm->vm_ctrls.rb_node);
 +    struct rb_node * parent = NULL;
 +    struct vm_ctrl * tmp_ctrl = NULL;
 +
 +    while (*p) {
 +      parent = *p;
 +      tmp_ctrl = rb_entry(parent, struct vm_ctrl, tree_node);
 +
 +      if (ctrl->cmd < tmp_ctrl->cmd) {
 +          p = &(*p)->rb_left;
 +      } else if (ctrl->cmd > tmp_ctrl->cmd) {
 +          p = &(*p)->rb_right;
 +      } else {
 +          return tmp_ctrl;
 +      }
 +    }
 +
 +    rb_link_node(&(ctrl->tree_node), parent, p);
 +
 +    return NULL;
 +}
 +
 +
 +
 +int add_guest_ctrl(struct v3_guest * guest, unsigned int cmd, 
 +                 int (*handler)(struct v3_guest * guest, 
 +                                unsigned int cmd, unsigned long arg, 
 +                                void * priv_data),
 +                 void * priv_data) {
 +    struct vm_ctrl * ctrl = kmalloc(sizeof(struct vm_ctrl), GFP_KERNEL);
 +
 +    if (ctrl == NULL) {
 +      printk("Error: Could not allocate vm ctrl %d\n", cmd);
 +      return -1;
 +    }
 +
 +    ctrl->cmd = cmd;
 +    ctrl->handler = handler;
 +    ctrl->priv_data = priv_data;
 +
 +    if (__insert_ctrl(guest, ctrl) != NULL) {
 +      printk("Could not insert guest ctrl %d\n", cmd);
 +      kfree(ctrl);
 +      return -1;
 +    }
 +    
 +    rb_insert_color(&(ctrl->tree_node), &(guest->vm_ctrls));
 +
 +    return 0;
 +}
 +
 +
 +static struct vm_ctrl * get_ctrl(struct v3_guest * guest, unsigned int cmd) {
 +    struct rb_node * n = guest->vm_ctrls.rb_node;
 +    struct vm_ctrl * ctrl = NULL;
 +
 +    while (n) {
 +      ctrl = rb_entry(n, struct vm_ctrl, tree_node);
 +
 +      if (cmd < ctrl->cmd) {
 +          n = n->rb_left;
 +      } else if (cmd > ctrl->cmd) {
 +          n = n->rb_right;
 +      } else {
 +          return ctrl;
 +      }
 +    }
 +
 +    return NULL;
 +}
 +
 +
  #ifdef V3_CONFIG_STREAM
  #include "palacios-stream.h"
  #endif
@@@ -129,6 -41,7 +129,7 @@@
  
  #ifdef V3_CONFIG_HOST_DEVICE
  #include "palacios-host-dev.h"
+ #define HOST_DEV_URL_LEN 256
  #endif
  
  extern struct class * v3_class;
@@@ -178,7 -91,10 +179,10 @@@ static long v3_vm_ioctl(struct file * f
        }
  
        case V3_VM_HOST_DEV_CONNECT: {
- #ifdef V3_CONFIG_HOST_DEV
+ #ifdef V3_CONFIG_HOST_DEVICE
+           void __user * argp = (void __user *)arg;
+           char host_dev_url[HOST_DEV_URL_LEN];
+ 
            if (copy_from_user(host_dev_url, argp, HOST_DEV_URL_LEN)) {
                printk("copy from user error getting url for host device connect...\n");
                return -EFAULT;
@@@ -211,17 -127,9 +215,17 @@@
            break;
  
  
 -      default: 
 -          printk("\tUnhandled\n");
 +      default: {
 +          struct vm_ctrl * ctrl = get_ctrl(guest, ioctl);
 +
 +          if (ctrl) {
 +              return ctrl->handler(guest, ioctl, arg, ctrl->priv_data);
 +          }
 +          
 +          
 +          printk("\tUnhandled ctrl cmd: %d\n", ioctl);
            return -EINVAL;
 +      }
      }
  
      return 0;
@@@ -256,7 -164,6 +260,6 @@@ static struct file_operations v3_vm_fop
  };
  
  
- extern int vm_running;
  extern u32 pg_allocs;
  extern u32 pg_frees;
  extern u32 mallocs;
@@@ -272,19 -179,6 +275,19 @@@ int start_palacios_vm(void * arg)  
      unlock_kernel();
      
  
 +    guest->v3_ctx = v3_create_vm(guest->img, (void *)guest, guest->name);
 +
 +    if (guest->v3_ctx == NULL) { 
 +      printk("palacios: failed to create vm\n");
 +      complete(&(guest->start_done));
 +      return -1;
 +    }
 +
 +    // init linux extensions
 +#ifdef V3_CONFIG_EXT_INSPECTOR
 +    inspect_vm(guest);
 +#endif
 +
      printk("Creating VM device: Major %d, Minor %d\n", MAJOR(guest->vm_dev), MINOR(guest->vm_dev));
  
      cdev_init(&(guest->cdev), &v3_vm_fops);
@@@ -298,7 -192,6 +301,6 @@@
  
      if (err) {
        printk("Fails to add cdev\n");
-       v3_free_vm(guest->v3_ctx);
        complete(&(guest->start_done));
        return -1;
      }
@@@ -306,7 -199,15 +308,15 @@@
      if (device_create(v3_class, NULL, guest->vm_dev, guest, "v3-vm%d", MINOR(guest->vm_dev)) == NULL){
        printk("Fails to create device\n");
        cdev_del(&(guest->cdev));
-       v3_free_vm(guest->v3_ctx);
+       complete(&(guest->start_done));
+       return -1;
+     }
+ 
+     guest->v3_ctx = v3_create_vm(guest->img, (void *)guest, guest->name);
+ 
+     if (guest->v3_ctx == NULL) { 
+       printk("palacios: failed to create vm\n");
+       cdev_del(&(guest->cdev));
        complete(&(guest->start_done));
        return -1;
      }
@@@ -316,7 -217,9 +326,7 @@@
      printk("palacios: launching vm\n");
  
  
 -#ifdef V3_CONFIG_EXT_INSPECTOR
 -    inspect_vm(guest);
 -#endif
 +
  
  
      if (v3_start_vm(guest->v3_ctx, 0xffffffff) < 0) { 

diff --combined linux_module/palacios.h
index 8923361,9fe9c29..62f43f1
--- 1/linux_module/palacios.h
--- 2/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@@ -64,10 -64,6 +64,10 @@@ struct v3_guest 
  
      char name[128];
  
 +
 +    struct rb_root vm_ctrls;
- 
++    struct list_head exts;
 +
      struct list_head files;
      struct list_head streams;
      struct list_head sockets;