X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios.h;h=9fe9c29fc3eebdaa4bc36a9d84a0bde21d09ce2f;hb=e595e6c854a5414edc0cd8c8b38545e78c19e549;hp=3ee850ad9b25e7ce28d10878d25180c6de1ed514;hpb=260bb3e805ebc92ae294c3c2b36d027ba8bca488;p=palacios.git

diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index 3ee850a..9fe9c29 100644
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@ -4,18 +4,37 @@
 #include <linux/cdev.h>
 #include <linux/list.h>
 #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"
+#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;
@@ -27,6 +46,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 {
@@ -41,8 +68,20 @@ struct v3_guest {
     struct list_head streams;
     struct list_head sockets;
 
+#ifdef V3_CONFIG_CONSOLE
     struct palacios_console console;
+#endif
+
+#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;
 
     dev_t vm_dev;