X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios.h;h=936b71af1185fe88c65683b69e77ed688ab1d4c8;hb=c94c9b19999f937b32627794c80e19c9be555822;hp=806e1e7785735732e722cf219f4b000848ee2157;hpb=4801e692b7344051eb94fff6faf1be53f621d422;p=palacios.git

diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index 806e1e7..936b71a 100644
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@ -6,17 +6,32 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 
-#include "palacios-console.h"
+
+#ifdef V3_CONFIG_GRAPHICS_CONSOLE
+#include "palacios-graphics-console.h"
+#endif
+
+#ifdef V3_CONFIG_HOST_DEVICE
+#include "palacios-host-dev.h"
+#endif
+
 
 /* Global Control IOCTLs */
 #define V3_START_GUEST 10
 #define V3_ADD_MEMORY 50
+#define V3_START_NETWORK 60
 
 /* VM Specific IOCTLs */
 #define V3_VM_CONSOLE_CONNECT 20
-#define V3_VM_SERIAL_CONNECT 21
+#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_HOST_DEV_CONNECT (10244+1)
+
+
 struct v3_guest_img {
     unsigned long long size;
     void * guest_data;
@@ -28,6 +43,14 @@ struct v3_mem_region {
     unsigned long long num_pages;
 };
 
+struct v3_network {
+    unsigned char socket;
+    unsigned char packet;
+    unsigned char vnet;
+};
+
+void * trace_malloc(size_t size, gfp_t flags);
+void trace_free(const void * objp);
 
 
 struct v3_guest {
@@ -38,11 +61,23 @@ 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;
 
-    struct palacios_console console;
+
+#ifdef V3_CONFIG_GRAPHICS_CONSOLE
+    struct palacios_graphics_console graphics_console;
+#endif
+
+#ifdef V3_CONFIG_HOST_DEVICE
+    struct palacios_host_dev hostdev;
+#endif
+
 
     struct completion start_done;
     struct completion thread_done;