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 f019e18..be62f33 100644 (file)
--- a/linux_module/palacios-dev.c
+++ b/linux_module/palacios-dev.c
@@ -32,6 +32,11 @@
 #include "palacios-inspector.h"
 #endif
 
+#ifdef V3_CONFIG_KEYED_STREAMS
+#include "palacios-keyed-stream.h"
+#endif
+
+
 MODULE_LICENSE("GPL");
 
 int mod_allocs = 0;
@@ -135,6 +140,9 @@ static long v3_dev_ioctl(struct file * filp,
            INIT_LIST_HEAD(&(guest->streams));
            INIT_LIST_HEAD(&(guest->files));
            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));
 
@@ -259,10 +267,18 @@ static int __init v3_init(void) {
     palacios_file_init();
 #endif
 
+#ifdef V3_CONFIG_KEYED_STREAMS
+    palacios_init_keyed_streams();
+#endif
+
 #ifdef V3_CONFIG_CONSOLE
     palacios_init_console();
 #endif
 
+#ifdef V3_CONFIG_GRAPHICS_CONSOLE
+    palacios_init_graphics_console();
+#endif
+
 #ifdef V3_CONFIG_EXT_INSPECTOR
     palacios_init_inspector();
 #endif
@@ -279,6 +295,10 @@ static int __init v3_init(void) {
     palacios_init_vnet();
 #endif
 
+#ifdef V3_CONFIG_HOST_DEVICE
+    palacios_init_host_dev();
+#endif
+
     return 0;
 
  failure1: