bug fixes for extension framework, and porting of console to new interface

[palacios.git] / linux_module / palacios.h

diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index b161832..936b71a 100644 (file)
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@ -6,9 +6,6 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 
-#ifdef V3_CONFIG_CONSOLE
-#include "palacios-console.h"
-#endif
 
 #ifdef V3_CONFIG_GRAPHICS_CONSOLE
 #include "palacios-graphics-console.h"
@@ -29,10 +26,10 @@
 #define V3_VM_STREAM_CONNECT 21
 #define V3_VM_STOP 22
 
-#define V3_VM_FB_INPUT 256+1
-#define V3_VM_FB_QUERY 256+2
+#define V3_VM_FB_INPUT (256+1)
+#define V3_VM_FB_QUERY (256+2)
 
-#define V3_VM_HOST_DEV_CONNECT 512+1
+#define V3_VM_HOST_DEV_CONNECT (10244+1)
 
 
 struct v3_guest_img {
@@ -64,15 +61,16 @@ struct v3_guest {
 
     char name[128];
 
+
+    struct rb_root vm_ctrls;
+    struct list_head exts;
+
     struct list_head files;
     struct list_head streams;
     struct list_head sockets;
 
-#ifdef V3_CONFIG_CONSOLE
-    struct palacios_console console;
-#endif
 
-#ifdef V3_CONFIG_CONSOLE
+#ifdef V3_CONFIG_GRAPHICS_CONSOLE
     struct palacios_graphics_console graphics_console;
 #endif