X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios-dev.c;h=e1143f89f34ea6d3300cab4d0a7f25198cdfdf94;hb=87628fa5006de431238dbd6d3d56ccc703a54847;hp=1dfafc2b180b5d958ca96e8b9a631e5513876b91;hpb=33bc7752b8a9c2b2aa92146dbcb5efbbe29086a5;p=palacios.git diff --git a/linux_module/palacios-dev.c b/linux_module/palacios-dev.c index 1dfafc2..e1143f8 100644 --- a/linux_module/palacios-dev.c +++ b/linux_module/palacios-dev.c @@ -28,6 +28,10 @@ #include "palacios-vnet.h" #include "palacios-packet.h" +#ifdef CONFIG_DEBUG_FS +#include "palacios-debugfs.h" +#endif + MODULE_LICENSE("GPL"); int mod_allocs = 0; @@ -169,36 +173,6 @@ static long v3_dev_ioctl(struct file * filp, break; } - case V3_START_NETWORK: { - struct v3_network net; - memset(&net, 0, sizeof(struct v3_network)); - - if(copy_from_user(&net, argp, sizeof(struct v3_network))){ - printk("copy from user error getting network service requests ... \n"); - return -EFAULT; - } - - #ifdef CONFIG_PALACIOS_SOCKET - if(net.socket == 1){ - palacios_socket_init(); - printk("Started Palacios Socket\n"); - } - #endif - #ifdef CONFIG_PALACIOS_PACKET - if(net.packet == 1){ - palacios_init_packet(NULL); - printk("Started Palacios Direct Network Bridge\n"); - } - #endif - #ifdef CONFIG_PALACIOS_VNET - if(net.vnet == 1){ - palacios_init_vnet(); - printk("Started Palacios VNET Service\n"); - } - #endif - - break; - } default: printk("\tUnhandled\n"); return -EINVAL; @@ -271,6 +245,23 @@ static int __init v3_init(void) { palacios_file_init(); palacios_init_console(); + +#ifdef CONFIG_DEBUG_FS + palacios_init_debugfs(); +#endif + +#ifdef CONFIG_PALACIOS_SOCKET + palacios_socket_init(); +#endif + +#ifdef CONFIG_PALACIOS_PACKET + palacios_init_packet(NULL); +#endif + +#ifdef CONFIG_PALACIOS_VNET + palacios_init_vnet(); +#endif + return 0; failure1: @@ -311,6 +302,11 @@ static void __exit v3_exit(void) { class_destroy(v3_class); + +#ifdef CONFIG_DEBUG_FS + palacios_deinit_debugfs(); +#endif + palacios_file_deinit(); palacios_deinit_stream();