Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio...

[palacios.git] / linux_module / palacios-vm.c

diff --git a/linux_module/palacios-vm.c b/linux_module/palacios-vm.c
index 3490548..6f65df6 100644 (file)
--- a/linux_module/palacios-vm.c
+++ b/linux_module/palacios-vm.c
@@ -32,10 +32,16 @@
 #endif
 
 #ifdef V3_CONFIG_EXT_INSPECTOR
-#include "palacios-debugfs.h"
+#include "palacios-inspector.h"
 #endif
 
+#ifdef V3_CONFIG_GRAPHICS_CONSOLE
+#include "palacios-graphics-console.h"
+#endif
 
+#ifdef V3_CONFIG_HOST_DEVICE
+#include "palacios-host-dev.h"
+#endif
 
 extern struct class * v3_class;
 #define STREAM_NAME_LEN 128
@@ -64,6 +70,7 @@ static long v3_vm_ioctl(struct file * filp,
 #endif
            break;
        }
+
        case V3_VM_STREAM_CONNECT: {
 #ifdef V3_CONFIG_STREAM
            void __user * argp = (void __user *)arg;
@@ -82,6 +89,40 @@ static long v3_vm_ioctl(struct file * filp,
            break;
        }
 
+       case V3_VM_HOST_DEV_CONNECT: {
+#ifdef V3_CONFIG_HOST_DEV
+           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;
+           }
+
+           return connect_host_dev(guest,host_dev_url);
+#else
+           printk("palacios: Host device support not available\n");
+           return -EFAULT;
+#endif
+           break;
+       }
+
+       case V3_VM_FB_INPUT: 
+#ifdef V3_CONFIG_GRAPHICS_CONSOLE
+           return palacios_graphics_console_user_input(&(guest->graphics_console),
+                                                       (struct v3_fb_input __user *) arg) ;
+#else
+           return -EFAULT;
+#endif
+           break;
+           
+       case V3_VM_FB_QUERY: 
+#ifdef V3_CONFIG_GRAPHICS_CONSOLE
+           return palacios_graphics_console_user_query(&(guest->graphics_console),
+                                                       (struct v3_fb_query_response __user *) arg);
+#else
+           return -EFAULT;
+#endif
+           break;
+
+
        default: 
            printk("\tUnhandled\n");
            return -EINVAL;
@@ -104,7 +145,6 @@ static ssize_t v3_vm_read(struct file * filp, char __user * buf, size_t size, lo
 
 
 static ssize_t v3_vm_write(struct file * filp, const char __user * buf, size_t size, loff_t * offset) {
-    
 
     return 0;
 }
@@ -120,7 +160,6 @@ static struct file_operations v3_vm_fops = {
 };
 
 
-
 extern int vm_running;
 extern u32 pg_allocs;
 extern u32 pg_frees;
@@ -133,7 +172,7 @@ int start_palacios_vm(void * arg)  {
 
     lock_kernel();
     daemonize(guest->name);
-//    allow_signal(SIGKILL);
+    // allow_signal(SIGKILL);
     unlock_kernel();
     
 
@@ -141,12 +180,13 @@ int start_palacios_vm(void * arg)  {
 
     if (guest->v3_ctx == NULL) { 
        printk("palacios: failed to create vm\n");
+       complete(&(guest->start_done));
        return -1;
     }
 
     printk("Creating VM device: Major %d, Minor %d\n", MAJOR(guest->vm_dev), MINOR(guest->vm_dev));
 
-    cdev_init(&(guest->cdev), &v3_vm_fops);    
+    cdev_init(&(guest->cdev), &v3_vm_fops);
 
     guest->cdev.owner = THIS_MODULE;
     guest->cdev.ops = &v3_vm_fops;
@@ -157,27 +197,34 @@ int start_palacios_vm(void * arg)  {
 
     if (err) {
        printk("Fails to add cdev\n");
+       v3_free_vm(guest->v3_ctx);
+       complete(&(guest->start_done));
        return -1;
     }
 
     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;
     }
 
     complete(&(guest->start_done));
 
-    printk("palacios: launching vm\n");   
-
+    printk("palacios: launching vm\n");
 
 
 #if V3_CONFIG_EXT_INSPECTOR
-    dfs_register_vm(guest);
+    inspect_vm(guest);
 #endif
 
 
     if (v3_start_vm(guest->v3_ctx, 0xffffffff) < 0) { 
        printk("palacios: launch of vm failed\n");
+       device_destroy(v3_class, guest->vm_dev);
+       cdev_del(&(guest->cdev));
+       v3_free_vm(guest->v3_ctx);
        return -1;
     }