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

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

diff --git a/linux_module/palacios-dev.c b/linux_module/palacios-dev.c
index 3899a2c..f640403 100644 (file)
--- a/linux_module/palacios-dev.c
+++ b/linux_module/palacios-dev.c
@@ -21,18 +21,10 @@
 #include "palacios.h"
 #include "palacios-mm.h"
 #include "palacios-vm.h"
-#include "palacios-serial.h"
-#include "palacios-socket.h"
-#include "palacios-vnet.h"
-#include "palacios-packet.h"
 
 #include "linux-exts.h"
 
 
-#ifdef V3_CONFIG_KEYED_STREAMS
-#include "palacios-keyed-stream.h"
-#endif
-
 
 MODULE_LICENSE("GPL");
 
@@ -133,11 +125,6 @@ static long v3_dev_ioctl(struct file * filp,
 
            INIT_LIST_HEAD(&(guest->exts));
 
-
-           INIT_LIST_HEAD(&(guest->sockets));
-#ifdef V3_CONFIG_HOST_DEVICE
-           INIT_LIST_HEAD(&(guest->hostdev.devs));
-#endif
            init_completion(&(guest->start_done));
            init_completion(&(guest->thread_done));
 
@@ -256,32 +243,6 @@ static int __init v3_init(void) {
 
 
 
-
-#ifdef V3_CONFIG_KEYED_STREAMS
-    palacios_init_keyed_streams();
-#endif
-
-#ifdef V3_CONFIG_GRAPHICS_CONSOLE
-    palacios_init_graphics_console();
-#endif
-
-
-#ifdef V3_CONFIG_SOCKET
-    palacios_socket_init();
-#endif
-
-#ifdef V3_CONFIG_PACKET
-    palacios_init_packet(NULL);
-#endif
-
-#ifdef V3_CONFIG_VNET
-    palacios_vnet_init();
-#endif
-
-#ifdef V3_CONFIG_HOST_DEVICE
-    palacios_init_host_dev();
-#endif
-
     return 0;
 
  failure1:
@@ -324,22 +285,6 @@ static void __exit v3_exit(void) {
 
     deinit_lnx_extensions();
 
-
-
-
-
-#ifdef V3_CONFIG_SOCKET
-    palacios_socket_deinit();
-#endif
-
-#ifdef V3_CONFIG_PACKET
-    palacios_deinit_packet(NULL);
-#endif
-
-#ifdef V3_CONFIG_VNET
-    palacios_vnet_deinit();
-#endif
-
     palacios_deinit_mm();
 
     printk("Palacios Module Mallocs = %d, Frees = %d\n", mod_allocs, mod_frees);