X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios-vm.c;h=04b338a6e3c2f3d6104e5387fe33568fe2e49117;hb=3d2ae914c0dae420aa777ad0b298060b808434f1;hp=2d1237499256e462efccca4d1e6a75123e8f176c;hpb=84ff69d67d79aa9641135b2d120fe800c91797b4;p=palacios.releases.git diff --git a/linux_module/palacios-vm.c b/linux_module/palacios-vm.c index 2d12374..04b338a 100644 --- a/linux_module/palacios-vm.c +++ b/linux_module/palacios-vm.c @@ -114,14 +114,8 @@ static struct vm_ctrl * get_ctrl(struct v3_guest * guest, unsigned int cmd) { -#ifdef V3_CONFIG_GRAPHICS_CONSOLE -#include "palacios-graphics-console.h" -#endif -#ifdef V3_CONFIG_HOST_DEVICE -#include "palacios-host-dev.h" -#define HOST_DEV_URL_LEN 256 -#endif + extern struct class * v3_class; @@ -141,45 +135,6 @@ static long v3_vm_ioctl(struct file * filp, break; } - - - case V3_VM_HOST_DEV_CONNECT: { -#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; - } - - 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: { struct vm_ctrl * ctrl = get_ctrl(guest, ioctl); @@ -249,9 +204,6 @@ int start_palacios_vm(void * arg) { return -1; } - // init linux extensions - - printk("Creating VM device: Major %d, Minor %d\n", MAJOR(guest->vm_dev), MINOR(guest->vm_dev));