X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios-dev.c;h=bb9598f403dfc011b483abaa57da81d35a05d33c;hb=b44db8fef71ea6c1c996b6c1fb162f61317a53be;hp=e3f83b6988169c1dde2d2a075685de9174001978;hpb=467878dcf7ccb6248c83483e01360b0ffdc83dc0;p=palacios-OLD.git

diff --git a/linux_module/palacios-dev.c b/linux_module/palacios-dev.c
index e3f83b6..bb9598f 100644
--- a/linux_module/palacios-dev.c
+++ b/linux_module/palacios-dev.c
@@ -28,7 +28,7 @@
 #include "palacios-vnet.h"
 #include "palacios-packet.h"
 
-#ifdef CONFIG_DEBUG_FS
+#ifdef V3_CONFIG_EXT_INSPECTOR
 #include "palacios-debugfs.h"
 #endif
 
@@ -173,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,15 +241,34 @@ static int __init v3_init(void) {
     
     palacios_vmm_init();
 
+#ifdef V3_CONFIG_STREAM
     palacios_init_stream();
+#endif
+
+#ifdef V3_CONFIG_FILE
     palacios_file_init();
-    palacios_init_console();
+#endif
 
+#ifdef V3_CONFIG_CONSOLE
+    palacios_init_console();
+#endif
 
-#ifdef CONFIG_DEBUG_FS
+#ifdef V3_CONFIG_INSPECTOR
     palacios_init_debugfs();
 #endif
 
+#ifdef V3_CONFIG_SOCKET
+    palacios_socket_init();
+#endif
+
+#ifdef V3_CONFIG_PACKET
+    palacios_init_packet(NULL);
+#endif
+
+#ifdef V3_CONFIG_VNET
+    palacios_init_vnet();
+#endif
+
     return 0;
 
  failure1:
@@ -321,12 +310,17 @@ static void __exit v3_exit(void) {
 
 
 
-#ifdef CONFIG_DEBUG_FS
+#ifdef V3_CONFIG_EXT_INSPECTOR
     palacios_deinit_debugfs();
 #endif
 
+#ifdef V3_CONFIG_FILE
     palacios_file_deinit();
+#endif
+
+#ifdef V3_CONFIG_STREAM
     palacios_deinit_stream();
+#endif
 
     palacios_deinit_mm();