move vnet code outside of palacios core directory

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

diff --git a/linux_module/palacios-dev.c b/linux_module/palacios-dev.c
index e3f83b6..60f01ec 100644 (file)
--- a/linux_module/palacios-dev.c
+++ b/linux_module/palacios-dev.c
@@ -28,8 +28,8 @@
 #include "palacios-vnet.h"
 #include "palacios-packet.h"
 
-#ifdef CONFIG_DEBUG_FS
-#include "palacios-debugfs.h"
+#ifdef V3_CONFIG_EXT_INSPECTOR
+#include "palacios-inspector.h"
 #endif
 
 MODULE_LICENSE("GPL");
@@ -162,47 +162,9 @@ static long v3_dev_ioctl(struct file * filp,
                return -EFAULT;
            }
 
-           // Mem test...
-           /*
-             {
-             void * vaddr = __va(alloc_palacios_pgs(131072, 4096));
-             memset(vaddr, 0xfe492fe2, mem.num_pages * 4096);
-             }
-           */
-
            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,13 +233,32 @@ static int __init v3_init(void) {
     
     palacios_vmm_init();
 
+#ifdef V3_CONFIG_STREAM
     palacios_init_stream();
+#endif
+
+#ifdef V3_CONFIG_FILE
     palacios_file_init();
+#endif
+
+#ifdef V3_CONFIG_CONSOLE
     palacios_init_console();
+#endif
+
+#ifdef V3_CONFIG_EXT_INSPECTOR
+    palacios_init_inspector();
+#endif
+
+#ifdef V3_CONFIG_SOCKET
+    palacios_socket_init();
+#endif
 
+#ifdef V3_CONFIG_PACKET
+    palacios_init_packet(NULL);
+#endif
 
-#ifdef CONFIG_DEBUG_FS
-    palacios_init_debugfs();
+#ifdef V3_CONFIG_VNET
+    palacios_init_vnet();
 #endif
 
     return 0;
@@ -321,12 +302,17 @@ static void __exit v3_exit(void) {
 
 
 
-#ifdef CONFIG_DEBUG_FS
-    palacios_deinit_debugfs();
+#ifdef V3_CONFIG_EXT_INSPECTOR
+    palacios_deinit_inspector();
 #endif
 
+#ifdef V3_CONFIG_FILE
     palacios_file_deinit();
+#endif
+
+#ifdef V3_CONFIG_STREAM
     palacios_deinit_stream();
+#endif
 
     palacios_deinit_mm();